From d57b54d8c81b4b80ae473f2588e821cb2a441392 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sat, 26 Mar 2022 14:33:27 +0100
Subject: [PATCH] Fix services start

---
 scripts/change_url | 2 +-
 scripts/install    | 4 ++--
 scripts/restore    | 9 +++++----
 scripts/upgrade    | 7 ++++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index faa4710..81a8a71 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -133,7 +133,7 @@ ynh_script_progression --message="Starting a systemd service..."
 
 # Start a systemd service
 ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/$app-web.log" --line_match="Started"
-ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="/var/log/$app/$app-jobs.log" --line_match="Started"
+ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/production.log" --line_match="Started"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/install b/scripts/install
index 85a802b..ebb76d2 100755
--- a/scripts/install
+++ b/scripts/install
@@ -172,7 +172,7 @@ ynh_add_systemd_config --service="$app-jobs" --template="jobs.service"
 ynh_script_progression --message="Integrating service in YunoHost..."
 
 yunohost service add "$app-web" --log="$final_path/log/unicorn.log"
-yunohost service add "$app-jobs" --log="/var/log/$app/$app-jobs.log"
+yunohost service add "$app-jobs" --log="$final_path/log/production.log"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -181,7 +181,7 @@ ynh_script_progression --message="Starting a systemd service..."
 
 # Start a systemd service
 ynh_systemd_action --service_name="$app-web" --action="start" --log_path="$final_path/log/unicorn.log" --line_match="Started"
-ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="/var/log/$app/$app-jobs.log" --line_match="Started"
+ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/production.log" --line_match="Starting"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/restore b/scripts/restore
index 5ec401c..0803a59 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -128,16 +128,17 @@ systemctl enable $app-jobs.service --quiet
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-ynh_add_systemd_config --service="$app-web" --template="web.service"
-ynh_add_systemd_config --service="$app-jobs" --template="jobs.service"
+yunohost service add "$app-web" --log="$final_path/log/unicorn.log"
+yunohost service add "$app-jobs" --log="$final_path/log/production.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..."
 
-yunohost service add "$app-web" --log="$final_path/log/unicorn.log"
-yunohost service add "$app-jobs" --log="/var/log/$app/$app-jobs.log"
+# Start a systemd service
+ynh_systemd_action --service_name="$app-web" --action="start" --log_path="$final_path/log/unicorn.log" --line_match="Started"
+ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/production.log" --line_match="Starting"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index a4b3044..6d7c483 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -166,15 +166,16 @@ ynh_add_systemd_config --service="$app-jobs" --template="jobs.service"
 ynh_script_progression --message="Integrating service in YunoHost..."
 
 yunohost service add "$app-web" --log="$final_path/log/unicorn.log"
-yunohost service add "$app-jobs" --log="/var/log/$app/$app-jobs.log"
+yunohost service add "$app-jobs" --log="$final_path/log/production.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_script_progression --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name="$app-web" --action="start" --log_path="/var/log/$app/$app-web.log" --line_match="Started"
-ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="/var/log/$app/$app-jobs.log" --line_match="Started"
+# Start a systemd service
+ynh_systemd_action --service_name="$app-web" --action="start" --log_path="$final_path/log/unicorn.log" --line_match="Started"
+ynh_systemd_action --service_name="$app-jobs" --action="start" --log_path="$final_path/log/production.log" --line_match="Starting"
 
 #=================================================
 # RELOAD NGINX