diff --git a/scripts/change_url b/scripts/change_url index 6f73f5b..e74175d 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -69,7 +69,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --time --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" --line_match="Stopped WireGuard UI" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF @@ -113,7 +113,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." --time --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" --line_match="http server started" --log_path="systemd" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index ef8f203..5955510 100644 --- a/scripts/install +++ b/scripts/install @@ -187,7 +187,7 @@ yunohost service add wireguard_ui --description "WireGuard UI" --log "/var/log/$ ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=wireguard_ui --action="start" --log_path="/var/log/$app/ui.log" +ynh_systemd_action --service_name=wireguard_ui --action="start" --line_match="http server started" --log_path="systemd" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index b033d2d..1c1abb1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -132,7 +132,7 @@ ynh_restore_file --origin_path=$(jq -r ".config_file_path" $final_path/db/server #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=wireguard_ui --action="start" --log_path="/var/log/$app/ui.log" +ynh_systemd_action --service_name=wireguard_ui --action="start" --line_match="http server started" --log_path="systemd" #================================================= # RESTORE THE LOGROTATE CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index a31f684..3864bef 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,7 +99,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=wireguard_ui --action="stop" --log_path="/var/log/$app/ui.log" +ynh_systemd_action --service_name=wireguard_ui --action="stop" --line_match="Stopped WireGuard UI" --log_path="systemd" systemctl disable --now --quiet wireguard.path ynh_systemd_action --service_name=wireguard --action="stop" @@ -211,7 +211,7 @@ yunohost service add wireguard_ui --description "WireGuard UI" --log "/var/log/$ ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=wireguard_ui --action="start" --log_path="/var/log/$app/ui.log" +ynh_systemd_action --service_name=wireguard_ui --action="start" --line_match="http server started" --log_path="systemd" #================================================= # RELOAD NGINX