From 75c8c79e384bc602b3a2dec3c0298545780a795e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 15 Jul 2022 17:20:21 +0200
Subject: [PATCH] Cleaning up

---
 conf/config.php |  2 +-
 scripts/install | 18 +++++++--------
 scripts/upgrade | 60 ++++++++++++++++++++++++-------------------------
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/conf/config.php b/conf/config.php
index 2aa6296..67692ed 100755
--- a/conf/config.php
+++ b/conf/config.php
@@ -27,7 +27,7 @@
 // mysql:unix_socket=/tmp/mysql.sock;dbname=ulogger;charset=utf8
 // pgsql:host=localhost;port=5432;dbname=ulogger
 // sqlite:/tmp/ulogger.db
-$dbdsn = "mysql:host=localhost;port=3307;dbname=__DB_USER__;charset=utf8";
+$dbdsn = "mysql:host=localhost;port=3307;dbname=__DB_NAME__;charset=utf8";
 
 // Database user name
 $dbuser = "__DB_USER__";
diff --git a/scripts/install b/scripts/install
index f7d9091..c0a0f2a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -53,6 +53,14 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin
 ynh_app_setting_set --app=$app --key=language --value=$language
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Configuring system user..."
+
+# Create a system user
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
 #=================================================
 # CREATE A MYSQL DATABASE
 #=================================================
@@ -60,7 +68,6 @@ ynh_script_progression --message="Creating a MySQL database..."
 
 db_name=$(ynh_sanitize_dbid --db_name=$app)
 db_user=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
 
@@ -81,14 +88,6 @@ ynh_script_progression --message="Configuring NGINX web server..."
 # Create a dedicated nginx config
 ynh_add_nginx_config
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..."
-
-# Create a system user
-ynh_system_user_create $app
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -113,6 +112,7 @@ cp "../conf/config.php" "$final_path/config.php"
 
 ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/config.php"
 ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_user" --target_file="$final_path/config.php"
+ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/config.php"
 
 ynh_replace_string --match_string="\$enabled = false;" --replace_string="\$enabled = true;" --target_file="$final_path/scripts/setup.php"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 29bdfd0..d99b66f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -29,6 +29,20 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 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
 #=================================================
@@ -53,22 +67,16 @@ 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
-
 #=================================================
 # STANDARD UPGRADE STEPS
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -96,22 +104,6 @@ then
 	ynh_secure_remove --file="$tmpdir"	
 fi
 
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..."
-
-# Create a dedicated nginx config
-ynh_add_nginx_config
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..."
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create $app
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -120,6 +112,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 # Create a dedicated php-fpm config
 ynh_add_fpm_config
 
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..."
+
+# Create a dedicated nginx config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================