From 0499559887ef681aa6a49a6773c7201889df11bb Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 19 Jun 2023 21:18:31 +0200
Subject: [PATCH] fix service?

---
 conf/funkwhale-beat.service   | 2 +-
 conf/funkwhale-server.service | 3 +--
 conf/funkwhale-worker.service | 2 +-
 conf/funkwhale.target         | 2 +-
 scripts/install               | 6 +++---
 scripts/restore               | 6 +++---
 scripts/upgrade               | 6 +++---
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/conf/funkwhale-beat.service b/conf/funkwhale-beat.service
index 5913bbc..533ad7a 100644
--- a/conf/funkwhale-beat.service
+++ b/conf/funkwhale-beat.service
@@ -49,4 +49,4 @@ CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
 CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/conf/funkwhale-server.service b/conf/funkwhale-server.service
index 239ae9c..18921a7 100644
--- a/conf/funkwhale-server.service
+++ b/conf/funkwhale-server.service
@@ -17,7 +17,6 @@ ExecStart=__INSTALL_DIR__/venv/bin/gunicorn \
     --worker-class uvicorn.workers.UvicornWorker \
     --bind ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}
     --timeout 120
-    --error-logfile /var/log/__APP__/__APP__-server.log
 ExecReload=/bin/kill -s HUP $MAINPID
 
 
@@ -34,4 +33,4 @@ CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
 CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/conf/funkwhale-worker.service b/conf/funkwhale-worker.service
index 4cf8fde..c41df91 100644
--- a/conf/funkwhale-worker.service
+++ b/conf/funkwhale-worker.service
@@ -51,4 +51,4 @@ CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
 CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/conf/funkwhale.target b/conf/funkwhale.target
index e8bca5e..f65d03e 100644
--- a/conf/funkwhale.target
+++ b/conf/funkwhale.target
@@ -3,4 +3,4 @@ Description=Funkwhale (__APP__)
 Wants=__APP__-server.service __APP__-worker.service __APP__-beat.service
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index bbe8d00..9f666a7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -131,9 +131,9 @@ chown -R $app:$app /var/log/$app/
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add "${app}-beat" --description="__APP__ celery beat process" --log="/var/log/__APP__/__APP__-beat.log"
-yunohost service add "${app}-server" --description="__APP__ application server" --log="/var/log/__APP__/__APP__-server.log"
-yunohost service add "${app}-worker" --description="__APP__ celery worker" --log="/var/log/__APP__/__APP__-worker.log"
+yunohost service add "${app}-beat" --description="${app} celery beat process" --log="/var/log/$app/${app}-beat.log"
+yunohost service add "${app}-server" --description="${app} application server" --log="/var/log/$app/${app}-server.log"
+yunohost service add "${app}-worker" --description="${app} celery worker" --log="/var/log/$app/${app}-worker.log"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/restore b/scripts/restore
index a5fda87..f713415 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -83,9 +83,9 @@ ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.se
 ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service"
 ynh_add_systemd_config --service="${app}-beat"   --template="funkwhale-beat.service"
 
-yunohost service add "${app}-beat" --description="__APP__ celery beat process" --log="/var/log/__APP__/__APP__-beat.log"
-yunohost service add "${app}-server" --description="__APP__ application server" --log="/var/log/__APP__/__APP__-server.log"
-yunohost service add "${app}-worker" --description="__APP__ celery worker" --log="/var/log/__APP__/__APP__-worker.log"
+yunohost service add "${app}-beat" --description="${app} celery beat process" --log="/var/log/$app/${app}-beat.log"
+yunohost service add "${app}-server" --description="${app} application server" --log="/var/log/$app/${app}-server.log"
+yunohost service add "${app}-worker" --description="${app} celery worker" --log="/var/log/$app/${app}-worker.log"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/upgrade b/scripts/upgrade
index 12d6e10..410c6df 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -143,9 +143,9 @@ ynh_add_systemd_config --service="${app}-beat"   --template="funkwhale-beat.serv
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add "${app}-beat" --description="__APP__ celery beat process" --log="/var/log/__APP__/__APP__-beat.log"
-yunohost service add "${app}-server" --description="__APP__ application server" --log="/var/log/__APP__/__APP__-server.log"
-yunohost service add "${app}-worker" --description="__APP__ celery worker" --log="/var/log/__APP__/__APP__-worker.log"
+yunohost service add "${app}-beat" --description="${app} celery beat process" --log="/var/log/$app/${app}-beat.log"
+yunohost service add "${app}-server" --description="${app} application server" --log="/var/log/$app/${app}-server.log"
+yunohost service add "${app}-worker" --description="${app} celery worker" --log="/var/log/$app/${app}-worker.log"
 
 #=================================================
 # START SYSTEMD SERVICE