From 3c05d628ab1d0a83a551d54cfb5a3e0771d8e6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 13 Sep 2022 18:08:13 +0200
Subject: [PATCH] 1.5.0

---
 conf/app.src           |  4 ++--
 conf/configuration.yml |  4 ++--
 manifest.json          |  4 ++--
 scripts/_common.sh     |  2 +-
 scripts/install        | 16 ++++++++--------
 scripts/restore        | 16 ++++++++--------
 scripts/upgrade        | 16 ++++++++--------
 7 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 71b2778..2edf6b5 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/flarum/flarum/archive/v1.4.0.zip
-SOURCE_SUM=7d8a529d0e83a17a4d97304d78446c1e5c192b7c979cb88c272d3f0a77646b90
+SOURCE_URL=https://github.com/flarum/flarum/archive/v1.5.0.zip
+SOURCE_SUM=f6bc6895e1b174384401ba1eff6d86c732b8991240b701ce5cdeb47ef5856cfe
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/conf/configuration.yml b/conf/configuration.yml
index 44f1c2a..862c900 100644
--- a/conf/configuration.yml
+++ b/conf/configuration.yml
@@ -1,8 +1,8 @@
 baseUrl : "https://__DOMAIN____PATH__"
 databaseConfiguration :
     host : "localhost"
-    database : "__USER__"
-    username : "__USER__"
+    database : "__DB_NAME__"
+    username : "__DB_USER__"
     password : "__DB_PWD__"
 adminUser :
     username : "__ADMIN__"
diff --git a/manifest.json b/manifest.json
index dbffa14..1e000cb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,7 +7,7 @@
         "fr": "Forum de nouvelle génération, simplement",
         "de": "Forum der nächsten Generation leicht gemacht"
     },
-    "version": "1.4.0~ynh2",
+    "version": "1.5.0~ynh1",
     "url": "http://flarum.org/",
     "upstream": {
         "license": "MIT",
@@ -27,7 +27,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm",
+        "php7.4-fpm",
         "mysql"
     ],
     "arguments": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 20fc593..68e01a6 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -13,7 +13,7 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-dom php
 pkg_dependencies="$extra_php_dependencies"
 
 # Version numbers
-project_version="1.4.0"
+project_version="1.5.0"
 #core_version is now retrieved from the manifest
 ldap_version="*"
 
diff --git a/scripts/install b/scripts/install
index 08e7924..6717a94 100644
--- a/scripts/install
+++ b/scripts/install
@@ -102,14 +102,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..."
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -119,6 +111,14 @@ ynh_script_progression --message="Configuring PHP-FPM..."
 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..."
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 0e7a94c..d521f54 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -45,20 +45,13 @@ test ! -d $final_path \
 
 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..."
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
 ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
 
 # Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app
+ynh_system_user_create --username=$app --home_dir=$final_path
 
 #=================================================
 # RESTORE THE APP MAIN DIR
@@ -91,6 +84,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=low --footprint=low
 
+#=================================================
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the NGINX configuration..."
+
+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 dcfc23b..cd761cd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -137,14 +137,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
 #=================================================
@@ -161,6 +153,14 @@ ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=1
 ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================