From 437febcd496873b505ebdf3e530001b5462d500b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Dec 2020 10:42:14 +0100 Subject: [PATCH] Fix change url --- scripts/change_url | 17 +++++++---------- scripts/install | 6 +++--- scripts/restore | 6 +++--- scripts/upgrade | 6 +++--- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index dbe11c9..a625ed1 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -30,11 +30,6 @@ ynh_script_progression --message="Loading installation settings..." --time --wei final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) -# Add settings here as needed by your application -#db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#db_user=$db_name -#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -73,9 +68,11 @@ fi #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --time --weight=1 +ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app-beat" --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app-server" --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app-worker" --action="stop" --log_path="/var/log/$app/$app.log" #================================================= # MODIFY URL IN NGINX CONF @@ -111,9 +108,9 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --action="start" --service_name="${app}-beat" -ynh_systemd_action --action="start" --service_name="${app}-server" -ynh_systemd_action --action="start" --service_name="${app}-worker" +ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app-server" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app-worker" --action="start" --log_path="/var/log/$app/$app.log" #================================================= # SETUP FAIL2BAN diff --git a/scripts/install b/scripts/install index ed9e0a1..a2135e2 100644 --- a/scripts/install +++ b/scripts/install @@ -221,9 +221,9 @@ yunohost service add "$app-beat" --log="/var/log/$app/beat.log" #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --action="start" --service_name="${app}-beat" -ynh_systemd_action --action="start" --service_name="${app}-server" -ynh_systemd_action --action="start" --service_name="${app}-worker" +ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app-server" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app-worker" --action="start" --log_path="/var/log/$app/$app.log" #================================================= # SETUP FAIL2BAN diff --git a/scripts/restore b/scripts/restore index c8aa60c..7871816 100644 --- a/scripts/restore +++ b/scripts/restore @@ -148,9 +148,9 @@ yunohost service add "$app-beat" --log="/var/log/$app/beat.log" #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --action="start" --service_name="${app}-beat" -ynh_systemd_action --action="start" --service_name="${app}-server" -ynh_systemd_action --action="start" --service_name="${app}-worker" +ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app-server" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app-worker" --action="start" --log_path="/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 6003f66..1ea95f0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -259,9 +259,9 @@ yunohost service add "$app-beat" --log="/var/log/$app/beat.log" #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --action="start" --service_name="${app}-beat" -ynh_systemd_action --action="start" --service_name="${app}-server" -ynh_systemd_action --action="start" --service_name="${app}-worker" +ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app-server" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app-worker" --action="start" --log_path="/var/log/$app/$app.log" #================================================= # RELOAD NGINX