From fecc39d856c77a15454bbd7acf2485bc34a4f1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 26 Aug 2022 23:16:47 +0200
Subject: [PATCH 1/2] 3.2.3

---
 conf/app.src    |  4 ++--
 manifest.json   |  2 +-
 scripts/install | 16 ++++++++--------
 scripts/restore | 17 +++++++++--------
 scripts/upgrade | 16 ++++++++--------
 5 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index f0e79a6..b36de25 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/omeka/omeka-s/releases/download/v3.2.2/omeka-s-3.2.2.zip
-SOURCE_SUM=7e14135b182bbb0e94539a52f4bd9c9c069bbd90cba9cfcf9da06e6a4aca4d24
+SOURCE_URL=https://github.com/omeka/omeka-s/releases/download/v3.2.3/omeka-s-3.2.3.zip
+SOURCE_SUM=65b6992809b943ea806eb40c5a4e65a5561dd689c0970e7a65a262c2198c69ef
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index ed1780f..fce412d 100755
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Web publication system for universities, galleries, libraries, archives, and museums",
         "fr": "Système de publication Web pour les universités, les galeries, les bibliothèques, les archives et les musées"
     },
-    "version": "3.2.2~ynh2",
+    "version": "3.2.3~ynh1",
     "url": "https://omeka.org/",
     "upstream": {
         "license": "AGPL-3.0-only",
diff --git a/scripts/install b/scripts/install
index b618459..92e0cf9 100755
--- a/scripts/install
+++ b/scripts/install
@@ -95,14 +95,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=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -112,6 +104,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=5
 ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 90cb5b9..13fcdaf 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -39,17 +39,11 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=1
 
-test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path \
+	|| ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..." --weight=2
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@@ -89,6 +83,13 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 # Recreate a dedicated php-fpm config
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
 
+#=================================================
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the NGINX configuration..." --weight=2
+
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 50249f3..7bfecf7 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -89,14 +89,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
 #=================================================
@@ -112,6 +104,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # RELOAD NGINX
 #=================================================

From 6b8c02afe9d52795d2ebd23127675babe1e0ad40 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 26 Aug 2022 21:16:54 +0000
Subject: [PATCH 2/2] 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 762d41f..43f9831 100755
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Omeka S is a web publication system for universities, galleries, libraries, arch
 - Connect to the semantic Web
 - Share with DPLA
 
-**Shipped version:** 3.2.2~ynh2
+**Shipped version:** 3.2.3~ynh1
 
 
 **Demo:** https://omeka.org/s/download/#sandbox
diff --git a/README_fr.md b/README_fr.md
index a4ae540..9da0994 100755
--- a/README_fr.md
+++ b/README_fr.md
@@ -22,7 +22,7 @@ Omeka S is a web publication system for universities, galleries, libraries, arch
 - Connect to the semantic Web
 - Share with DPLA
 
-**Version incluse :** 3.2.2~ynh2
+**Version incluse :** 3.2.3~ynh1
 
 
 **Démo :** https://omeka.org/s/download/#sandbox