From 2ca7d8ff9bbd5b1e88e41108cde6f24cdfa66527 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 20 Nov 2021 08:47:54 +0100
Subject: [PATCH 1/7] 4.3

---
 conf/app.src    |  7 +++----
 conf/nginx.conf |  5 -----
 manifest.json   |  6 ++----
 scripts/restore |  2 --
 scripts/upgrade | 29 ++++++++++++++---------------
 5 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 6e42650..658b3db 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,6 +1,5 @@
-SOURCE_URL=https://github.com/jh3y/tyto/archive/057781327fcfbfed3cf43da0993c5f4a5816a078.zip
-SOURCE_SUM=cae63ac06dfe555e022fc231549eab0d7cd9d5e8a3235adeff4d5e5a793f134b
+SOURCE_URL=https://github.com/jh3y/tyto/archive/refs/tags/3.0.4.tar.gz
+SOURCE_SUM=12d59901d2c221bbbfbff95036c9c4023b4629cca5a63aa8750739a7b22f1ed8
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=zip
+SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 052c370..508fc0a 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,11 +4,6 @@ location __PATH__/ {
   # Path to source
   alias __FINALPATH__/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;
 }
diff --git a/manifest.json b/manifest.json
index db45cd1..e95f231 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,7 +12,6 @@
         "license": "MIT",
         "website": "https://jh3y.github.io/tyto/",
         "demo": "https://jh3y.github.io/tyto/",
-        "userdoc": "https://yunohost.org/apps",
         "code": "https://github.com/jh3y/tyto"
     },
     "license": "MIT",
@@ -22,7 +21,7 @@
         "url": "https://datamol.org"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
@@ -32,8 +31,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "path",
diff --git a/scripts/restore b/scripts/restore
index d8274a7..2492a06 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -33,8 +33,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
 test ! -d $final_path \
 	|| ynh_die --message="There is already a directory: $final_path "
 
diff --git a/scripts/upgrade b/scripts/upgrade
index fd4a9de..8df6f5c 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,10 +23,23 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 #=================================================
 # CHECK VERSION
 #=================================================
-ynh_script_progression --message="Checking version..."
 
 upgrade_type=$(ynh_check_app_version_changed)
 
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
+
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+	# restore it if the upgrade fails
+	ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -45,20 +58,6 @@ if ynh_legacy_permissions_exists; then
 	ynh_app_setting_delete --app=$app --key=is_public
 fi
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # CREATE DEDICATED USER
 #=================================================

From 3615f6853b4f8a29b0ce0221ded6605a0169064a Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Sat, 20 Nov 2021 07:48:02 +0000
Subject: [PATCH 2/7] Auto-update README

---
 README.md    | 1 -
 README_fr.md | 1 -
 2 files changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 2313185..dcd7d48 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@ Simple, minimal electronic post-it board
 ## Documentation and resources
 
 * Official app website: https://jh3y.github.io/tyto/
-* Official user documentation: https://yunohost.org/apps
 * Upstream app code repository: https://github.com/jh3y/tyto
 * YunoHost documentation for this app: https://yunohost.org/app_tyto
 * Report a bug: https://github.com/YunoHost-Apps/tyto_ynh/issues
diff --git a/README_fr.md b/README_fr.md
index 008876c..ed6a213 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -24,7 +24,6 @@ Tableau de post-it électroniques, simple et minimaliste
 ## Documentations et ressources
 
 * Site officiel de l'app : https://jh3y.github.io/tyto/
-* Documentation officielle utilisateur : https://yunohost.org/apps
 * Dépôt de code officiel de l'app : https://github.com/jh3y/tyto
 * Documentation YunoHost pour cette app : https://yunohost.org/app_tyto
 * Signaler un bug : https://github.com/YunoHost-Apps/tyto_ynh/issues

From 8b341259bac247fcdbdef54b952d4f52c368d84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 20 Nov 2021 08:48:36 +0100
Subject: [PATCH 3/7] Delete .DS_Store

---
 .DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 145651ddf37dd0eae5fb377facacdeb2a2c56f1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}&BV5Z(pU5@Y0GBFDXW;{Ykj$)rI%cr&TdgBoZpktVfEph&dV^fmO2d;(v`
zncc0C$ib5_GDCL1nVp&4&X=%1j4|Gw1ue#Ej4=xuB1dJ3;P6sc$pj;EoMSrnBk6<n
z=8ui<uLFL2nFUO;8-M=w`=fB0G@I|dRIaS8Z&+3MZCTguNY35FOJ>uqH@QUX)JsOb
z(a)reK6TGO4~O%9ZRbeFi5JGhiAoNGA%t9AgmEC}T{(+`shY>t4qT_&uhrAkw)Y#t
zZnv|BNIRWoL$vLKEUQ|(d#%Hh!QI1S`jkDtXnr}+uVmX`0k5E#^6uS99Le|=MvCYn
zijWu}28aP-V5Jx^$AGoDQdLv2!~iky69#a95YP}EgSkevbwG#LXY^MPQ9#GH1fnqL
z7|b<-2ZZZXK%L6X6NBq?7#AkaF_>%A>5QwDVIH$`@p$2Cbr=^aoN-4Z^~3-%u*g7J
zn>9TDkKr$~^pU@qLKZPV4E!?&c%|p|x=@rkTfdcuXRUxXfQEu`IVvEaFI)n^z<s2y
eoZ2r?hd9Szt`TR!ag`287Xd{Gb;Q6gFz^9m8BekR


From b60354f9dd371c68007e21c301a14e65f1c7b36a Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 20 Nov 2021 08:49:25 +0100
Subject: [PATCH 4/7] Create DESCRIPTION.md

---
 doc/DESCRIPTION.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/DESCRIPTION.md

diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
new file mode 100644
index 0000000..3959d68
--- /dev/null
+++ b/doc/DESCRIPTION.md
@@ -0,0 +1 @@
+tyto is an extensible and customizable management and organisation tool.
\ No newline at end of file

From da31d42ba57bf4c0312ec74844791b0c4bddcb62 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Sat, 20 Nov 2021 07:49:35 +0000
Subject: [PATCH 5/7] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dcd7d48..e53cf30 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Simple, minimal electronic post-it board
+tyto is an extensible and customizable management and organisation tool.
 
 **Shipped version:** 3.0.4~ynh2
 
diff --git a/README_fr.md b/README_fr.md
index ed6a213..a706d43 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 ## Vue d'ensemble
 
-Tableau de post-it électroniques, simple et minimaliste
+tyto is an extensible and customizable management and organisation tool.
 
 **Version incluse :** 3.0.4~ynh2
 

From 73072c8e62e14865351c3f9ec3b9f94dcd0aa7b3 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 10 Mar 2022 01:39:42 +0100
Subject: [PATCH 6/7] Apply example_ynh

---
 check_process      |   3 +++
 conf/app.src       |   2 ++
 doc/.DS_Store      | Bin 6148 -> 0 bytes
 manifest.json      |   2 +-
 scripts/backup     |   2 +-
 scripts/change_url |  14 +++++++-------
 scripts/install    |   2 +-
 scripts/remove     |   2 +-
 scripts/restore    |   6 +++---
 scripts/upgrade    |   8 ++++----
 10 files changed, 23 insertions(+), 18 deletions(-)
 delete mode 100644 doc/.DS_Store

diff --git a/check_process b/check_process
index 90bfdf3..a545cbf 100644
--- a/check_process
+++ b/check_process
@@ -11,8 +11,11 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
+		# 3.0.4~ynh2
+		upgrade=1	from_commit=db9a6b110a2d2b5f4a7010159d20b3d0cda1b74b
 		backup_restore=1
 		multi_instance=1
+		port_already_use=0
 		change_url=1
 ;;; Options
 Email=anmol@datamol.org
diff --git a/conf/app.src b/conf/app.src
index 658b3db..7e5dd24 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -3,3 +3,5 @@ SOURCE_SUM=12d59901d2c221bbbfbff95036c9c4023b4629cca5a63aa8750739a7b22f1ed8
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=
+SOURCE_EXTRACT=true
diff --git a/doc/.DS_Store b/doc/.DS_Store
deleted file mode 100644
index b5e9f0085dbef67b8e881ecebc38d1c00cec3684..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!Ab)$5S`SjyA-hpL65n3>!GDpPr_2`!JDw62Nm6Q7rRh5(%o9LR`xgakNg6E
z$C)Ipl<G+kDKla6CX<<jye!EE07QEbH2|sr;GhzgT&%tk>L;C(lJyV@Jw^;EWY7f#
z`CK$R{v!jlcNN^T8|Xuf<!k@4aG2ePJr!cadwAbVvb<jZ5T&K^^2(~?Vp(%8{jM7N
zd5{mXcF;ek)^U(`Lu;QX)tlNuc$&n+tLnyqO7kE|<GxN#q8LLi&XP1z!?qfvQKrZ7
zO$W{6URAe7qh@obCY!C+xF$z?d-a-ZHFw8j*V)`|>>pj<JwA<|$1ksjV}YNemUW90
zcthid<v#fRw5QTrjF@CkvKW~GW`G%3Fb3=~=TsJKUA!D-fEoBb19Uz}R6@^UVNf3(
zSkdnz^_K}r(5ANpp|t2(EDT}~iZH2&CRNxchA`>qmp0C`SQs?vAoR>Qj-6T97mCoc
zqhIQ95S~G<nE_^CmVqVHtkV5|`1AXJHi=uz05h;q42W{a@3e7A_HLb99No1N^%|9g
o;tGS)6g2czjIneTZ=q^Iza#_Evsf5J4+{SXXd1X;2L6<RPZ$VQF8}}l

diff --git a/manifest.json b/manifest.json
index e95f231..3e9e44d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -28,7 +28,7 @@
         "nginx"
     ],
     "arguments": {
-        "install" : [
+        "install": [
             {
                 "name": "domain",
                 "type": "domain"
diff --git a/scripts/backup b/scripts/backup
index 87e89d3..6201eec 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -6,7 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
+# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/change_url b/scripts/change_url
index b7addbc..211d42d 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -30,7 +30,7 @@ ynh_script_progression --message="Loading installation settings..."
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
 #=================================================
 ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..."
 
@@ -40,7 +40,7 @@ ynh_clean_setup () {
 	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
 	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
 
-	# restore it if the upgrade fails
+	# Restore it if the upgrade fails
 	ynh_restore_upgradebackup
 }
 # Exit if an error occurs during the execution of the script
@@ -71,19 +71,19 @@ ynh_script_progression --message="Updating NGINX web server configuration..."
 
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
-# Change the path in the nginx config file
+# Change the path in the NGINX config file
 if [ $change_path -eq 1 ]
 then
-	# Make a backup of the original nginx config file if modified
+	# Make a backup of the original NGINX config file if modified
 	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-	# Set global variables for nginx helper
+	# Set global variables for NGINX helper
 	domain="$old_domain"
 	path_url="$new_path"
-	# Create a dedicated nginx config
+	# Create a dedicated NGINX config
 	ynh_add_nginx_config
 fi
 
-# Change the domain for nginx
+# Change the domain for NGINX
 if [ $change_domain -eq 1 ]
 then
 	# Delete file checksum for the old conf file location
diff --git a/scripts/install b/scripts/install
index 6096664..c9f5436 100755
--- a/scripts/install
+++ b/scripts/install
@@ -71,7 +71,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Configuring NGINX web server..."
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 781098a..dfa828c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -34,7 +34,7 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 ynh_script_progression --message="Removing NGINX web server configuration..."
 
-# Remove the dedicated nginx config
+# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 2492a06..5d386cf 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,7 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
+# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
@@ -20,7 +20,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading settings..."
+ynh_script_progression --message="Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -41,7 +41,7 @@ test ! -d $final_path \
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..."
+ynh_script_progression --message="Restoring the NGINX web server configuration..."
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 8df6f5c..1693bc9 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -34,12 +34,14 @@ ynh_script_progression --message="Backing up the app before upgrading (may take
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {
-	# restore it if the upgrade fails
+	# Restore it if the upgrade fails
 	ynh_restore_upgradebackup
 }
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
+#=================================================
+# STANDARD UPGRADE STEPS
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -66,8 +68,6 @@ ynh_script_progression --message="Making sure dedicated system user exists..."
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app --home_dir="$final_path"
 
-#=================================================
-# STANDARD UPGRADE STEPS
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -89,7 +89,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Upgrading NGINX web server configuration..."
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================

From dca4c3dd51a3b2b9eb1d2e311c575316b7ecf6b8 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 11 Mar 2022 01:43:47 +0100
Subject: [PATCH 7/7] switch back source

---
 conf/app.src | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 7e5dd24..71ccad7 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/jh3y/tyto/archive/refs/tags/3.0.4.tar.gz
-SOURCE_SUM=12d59901d2c221bbbfbff95036c9c4023b4629cca5a63aa8750739a7b22f1ed8
+SOURCE_URL=https://github.com/jh3y/tyto/archive/057781327fcfbfed3cf43da0993c5f4a5816a078.zip
+SOURCE_SUM=cae63ac06dfe555e022fc231549eab0d7cd9d5e8a3235adeff4d5e5a793f134b
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
+SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
 SOURCE_FILENAME=
 SOURCE_EXTRACT=true