From cac8d108cf39080c71d4ea72adf80e39c9da5282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:32:24 +0200
Subject: [PATCH] Fix

---
 conf/app.src    |  4 ++--
 manifest.json   |  4 ++--
 scripts/install | 16 ++++++++--------
 scripts/restore | 24 +++++++++++-------------
 scripts/upgrade | 16 ++++++++--------
 5 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index c8ea983..e4ccee6 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.17.2/snappymail-2.17.2.tar.gz
-SOURCE_SUM=08a5158b433d0e185f25141022aea02c6b29b5ad017042b55692289611acddad
+SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.17.3/snappymail-2.17.3.tar.gz
+SOURCE_SUM=0236e28bc026779ce234d6d871c2f59ccd18a9ba37c45d57381c8079ba4432e9
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/manifest.json b/manifest.json
index 0302c1c..03ff72e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Simple, modern, lightweight & fast web-based e-mail client",
         "fr": "Client de messagerie Web simple, moderne, léger et rapide"
     },
-    "version": "2.17.2~ynh1",
+    "version": "2.17.3~ynh1",
     "url": "https://snappymail.eu/",
     "upstream": {
         "license": "AGPL-3.0-only",
@@ -21,7 +21,7 @@
         "email": ""
     },
     "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.0.9"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/install b/scripts/install
index a7cfb5d..a45b382 100755
--- a/scripts/install
+++ b/scripts/install
@@ -78,14 +78,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=2
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -94,6 +86,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..." --weight=2
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 2361430..302c841 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -43,13 +43,6 @@ test ! -d $final_path \
 
 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@@ -69,6 +62,14 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=10
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
@@ -77,14 +78,11 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================
-# SPECIFIC RESTORATION
+# RESTORE THE NGINX CONFIGURATION
 #=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=10
+ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
 
-# Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 18acf3c..0c7a8a5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -64,14 +64,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@@ -87,6 +79,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================