From eed68449709b1c1305844bd12ebb044232cd1654 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 5 Mar 2021 13:27:07 +0100 Subject: [PATCH] Fix services --- scripts/change_url | 4 ++-- scripts/install | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 04784e9..cf801f6 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -74,7 +74,7 @@ fi #================================================= 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 --action="stop" --log_path="systemd" --line_match="Stopped" #================================================= # MODIFY URL IN NGINX CONF @@ -119,7 +119,7 @@ fi ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index 75c0d19..8430a0f 100755 --- a/scripts/install +++ b/scripts/install @@ -174,7 +174,7 @@ chmod o=--- $final_path/settings.py #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A simple donation form" --log="/var/log/$app/$app.log" +yunohost service add $app --description="A simple donation form" --log_type="systemd" #================================================= # START SYSTEMD SERVICE @@ -182,7 +182,7 @@ yunohost service add $app --description="A simple donation form" --log="/var/log ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 4d0c4c5..dfc084c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -118,14 +118,14 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A simple donation form" --log="/var/log/$app/$app.log" +yunohost service add $app --description="A simple donation form" --log_type="systemd" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index a122c90..719c018 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -64,7 +64,7 @@ ynh_abort_if_errors #================================================= 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 --action="stop" --log_path="systemd" --line_match="Stopped" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -165,14 +165,14 @@ chmod o=--- $final_path/settings.py #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A simple donation form" --log="/var/log/$app/$app.log" +yunohost service add $app --description="A simple donation form" --log_type="systemd" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started" #================================================= # RELOAD NGINX