From aa8928abd9d670920a23e922ab6d188ba530ffb1 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 17 Feb 2021 19:22:07 +0100
Subject: Apply last example_ynh

---
 scripts/restore | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'scripts/restore')

diff --git a/scripts/restore b/scripts/restore
index 84610eb..aef19ad 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 # MANAGE SCRIPT FAILURE
 #=================================================
-ynh_script_progression --message="Managing script failure..."
 
 ynh_clean_setup () {
 	ynh_clean_check_starting
@@ -34,7 +33,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$app
+db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
 
 #=================================================
@@ -135,7 +134,7 @@ ynh_script_progression --message="Restoring the systemd configuration..."
 ynh_restore_file --origin_path="/etc/systemd/system/$app-web.service"
 ynh_restore_file --origin_path="/etc/systemd/system/$app-sidekiq.service"
 ynh_restore_file --origin_path="/etc/systemd/system/$app-streaming.service"
-systemctl enable "$app-web" "$app-sidekiq" "$app-streaming"
+systemctl enable "$app-web" "$app-sidekiq" "$app-streaming" --quiet
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
@@ -167,7 +166,7 @@ ynh_restore_file --origin_path="/etc/cron.d/$app"
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
 
-- 
cgit v1.2.3-70-g09d2


From 162a807f5ba1c2ce3e3f7420dc7ba1bdc906537a Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 21 Feb 2021 22:27:05 +0100
Subject: Using option '--log_type systemd' with 'yunohost service add' is not
 relevant anymore

---
 scripts/install | 6 +++---
 scripts/restore | 6 +++---
 scripts/upgrade | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'scripts/restore')

diff --git a/scripts/install b/scripts/install
index 8f4ca05..a7ee1cb 100644
--- a/scripts/install
+++ b/scripts/install
@@ -252,9 +252,9 @@ chown -R "$app": "$final_path"
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add "$app-web" --description "$app web service" --log_type "systemd"
-yunohost service add "$app-sidekiq" --description "$app sidekiq service" --log_type "systemd"
-yunohost service add "$app-streaming" --description "$app streaming service" --log_type "systemd"
+yunohost service add "$app-web" --description "$app web service"
+yunohost service add "$app-sidekiq" --description "$app sidekiq service"
+yunohost service add "$app-streaming" --description "$app streaming service"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/restore b/scripts/restore
index aef19ad..11729d4 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -141,9 +141,9 @@ systemctl enable "$app-web" "$app-sidekiq" "$app-streaming" --quiet
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add "$app-web" --description "$app web service" --log_type "systemd"
-yunohost service add "$app-sidekiq" --description "$app sidekiq service" --log_type "systemd"
-yunohost service add "$app-streaming" --description "$app streaming service" --log_type "systemd"
+yunohost service add "$app-web" --description "$app web service"
+yunohost service add "$app-sidekiq" --description "$app sidekiq service"
+yunohost service add "$app-streaming" --description "$app streaming service"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/upgrade b/scripts/upgrade
index 4b0c4ae..cd84ac8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -308,9 +308,9 @@ chown -R $app: $final_path
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add "$app-web" --description "$app web service" --log_type "systemd"
-yunohost service add "$app-sidekiq" --description "$app sidekiq service" --log_type "systemd"
-yunohost service add "$app-streaming" --description "$app streaming service" --log_type "systemd"
+yunohost service add "$app-web" --description "$app web service"
+yunohost service add "$app-sidekiq" --description "$app sidekiq service"
+yunohost service add "$app-streaming" --description "$app streaming service"
 
 #=================================================
 # START SYSTEMD SERVICE
-- 
cgit v1.2.3-70-g09d2


From 88969d7b7ad4e3581599f748ea3b61dfc51c19a5 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 23 Feb 2021 04:14:27 +0100
Subject: Fix bad database user name

---
 scripts/remove  | 2 +-
 scripts/restore | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts/restore')

diff --git a/scripts/remove b/scripts/remove
index 46a78ab..0c71d04 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -20,7 +20,7 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
+db_user=$app
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 11729d4..e51126f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -33,7 +33,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
+db_user=$app
 db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
 
 #=================================================
-- 
cgit v1.2.3-70-g09d2