From a11dfd74cd9ef1c3dacf507fc17cf5feb9d34950 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 28 Feb 2021 12:19:53 +0100 Subject: [PATCH] Set log path to systemd --- scripts/change_url | 2 +- scripts/config | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index b3954a7..03a1589 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -130,7 +130,7 @@ ynh_systemd_action --action=reload --service_name=nginx ynh_script_progression --message="Restarting Etherpad..." --weight=10 # Wait for etherpad to be fully started -ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --action=restart --log_path=systemd --line_match="Your Etherpad version is" #================================================= # DEACTIVE MAINTENANCE MODE diff --git a/scripts/config b/scripts/config index fff3a97..d2126b0 100644 --- a/scripts/config +++ b/scripts/config @@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get $app final_path) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # SPECIFIC CODE @@ -321,7 +321,7 @@ apply_config() { if [ $restart_etherpad -eq 1 ] then # Wait for Etherpad to be fully started - ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" + ynh_systemd_action --action=restart --log_path=systemd --line_match="Your Etherpad version is" fi #================================================= diff --git a/scripts/restore b/scripts/restore index 2abfa04..cb91275 100644 --- a/scripts/restore +++ b/scripts/restore @@ -171,7 +171,7 @@ ynh_systemd_action --action=reload --service_name=nginx ynh_script_progression --message="Restarting Etherpad..." --weight=8 # Wait for etherpad to be fully started -ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --action=restart --log_path=systemd --line_match="Your Etherpad version is" #================================================= # DEACTIVE MAINTENANCE MODE diff --git a/scripts/upgrade b/scripts/upgrade index cee13ca..a295df7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -397,7 +397,7 @@ ynh_systemd_action --action=reload --service_name=nginx ynh_script_progression --message="Restarting Etherpad..." --weight=9 # Wait for etherpad to be fully started -ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --action=restart --log_path=systemd --line_match="Your Etherpad version is" #================================================= # DEACTIVE MAINTENANCE MODE