From 0ff56405b8ef86b157138b704a7a4186a2aa6009 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Fri, 4 Aug 2023 02:53:38 +0200
Subject: [PATCH] Fix #358

---
 scripts/_common.sh | 2 +-
 scripts/install    | 6 +++---
 scripts/restore    | 2 +-
 scripts/upgrade    | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 10c35ba..6ee012b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+	#!/bin/bash
 
 #=================================================
 # COMMON VARIABLES
diff --git a/scripts/install b/scripts/install
index f7e310d..3896502 100644
--- a/scripts/install
+++ b/scripts/install
@@ -198,7 +198,7 @@ ynh_script_progression --message="Starting a systemd service..."
 mkdir -p "/var/log/$app"
 chown -R $app:$app "/var/log/$app"
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="HTTP server listening on localhost" --timeout=300 --length=200
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started"
 
 #=================================================
 # INSTALL LDAP PLUGIN
@@ -233,7 +233,7 @@ popd
 ynh_script_progression --message="Stopping a systemd service..."
 
 # Stop a systemd service
-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"
 
 #=================================================
 # GENERIC FINALIZATION
@@ -258,7 +258,7 @@ yunohost service add $app --description="$app daemon for Peertube" --log="/var/l
 ynh_script_progression --message="Starting a systemd service..."
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="HTTP server listening on localhost"
+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 c1a0e62..775df02 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -144,7 +144,7 @@ yunohost service add $app --description="$app daemon for Peertube" --log="/var/l
 #=================================================
 ynh_script_progression --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="HTTP server listening on localhost"
+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 6721ed0..86deeeb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -61,7 +61,7 @@ ynh_abort_if_errors
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..."
 
-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"
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -260,7 +260,7 @@ ynh_script_progression --message="Starting a systemd service..."
 mkdir -p "/var/log/$app"
 chown -R $app:$app "/var/log/$app"
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="HTTP server listening on localhost" --timeout=5400 --length=200
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started"
 
 #=================================================
 # INSTALL LDAP PLUGIN
@@ -305,7 +305,7 @@ fi
 ynh_script_progression --message="Stopping a systemd service..."
 
 # Stop a systemd service
-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"
 
 #=================================================
 # GENERIC FINALIZATION
@@ -329,7 +329,7 @@ yunohost service add $app --description="$app daemon for Peertube" --log="/var/l
 #=================================================
 ynh_script_progression --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="HTTP server listening on localhost"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started"
 
 #=================================================
 # RELOAD NGINX