From 0574bcd732858190deeb080b2dd3806533f75ee1 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 13 May 2021 22:35:44 +0200
Subject: [PATCH] remove others_var

---
 check_process   | 6 +++++-
 manifest.json   | 4 ++--
 scripts/install | 6 +++---
 scripts/upgrade | 6 +++---
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/check_process b/check_process
index ea05a96..de19364 100644
--- a/check_process
+++ b/check_process
@@ -19,7 +19,9 @@
 		# 0.19.1
 		upgrade=1	from_commit=4d4bf0981e2d3a00eaae6b19bd54344fe55d6530
 		# 1.1~ynh1
-		upgrade=1   from_commit=8172790fb461d16f09089593fdac380f0d499c83
+		upgrade=1	from_commit=8172790fb461d16f09089593fdac380f0d499c83
+		# 1.1.1~ynh1
+		upgrade=1	from_commit=fa9587f61e4bb4f9db8667b1c6701ede37ac8e91
 		backup_restore=1
 		multi_instance=1
 		incorrect_path=0
@@ -34,3 +36,5 @@ Notification=all
 		manifest_arg=domain=DOMAIN&path=/&admin=USER&is_public=1
 	; commit=8172790fb461d16f09089593fdac380f0d499c83
 		name=1.1~ynh1
+	; commit=fa9587f61e4bb4f9db8667b1c6701ede37ac8e91
+		name=1.1.1~ynh1
diff --git a/manifest.json b/manifest.json
index 08991a5..d4b73ce 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Modern, convivial and free music server",
         "fr": "Serveur de musique moderne, convivial et gratuit"
     },
-    "version": "1.1.1~ynh1",
+    "version": "1.1.1~ynh2",
     "url": "https://funkwhale.audio",
     "license": "AGPL-3.0-or-later",
     "maintainer": {
@@ -18,7 +18,7 @@
         "email": "jean-baptiste@holcroft.fr"
     }],
     "requirements": {
-        "yunohost": ">= 4.1.3"
+        "yunohost": ">= 4.2.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/install b/scripts/install
index bf0e8cb..08c4709 100644
--- a/scripts/install
+++ b/scripts/install
@@ -158,9 +158,9 @@ ynh_script_progression --message="Configuring a systemd service..."
 ynh_add_config --template="../conf/funkwhale.target" --destination="/etc/systemd/system/$app.target"
 
 # Create a dedicated systemd config
-ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service" --others_var="datadir"
-ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service" --others_var="datadir"
-ynh_add_systemd_config --service="${app}-beat"   --template="funkwhale-beat.service" --others_var="datadir"
+ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service"
+ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service"
+ynh_add_systemd_config --service="${app}-beat"   --template="funkwhale-beat.service"
 
 #=================================================
 # INSTALL PYTHON DEPENDENCIES
diff --git a/scripts/upgrade b/scripts/upgrade
index aa21fd0..60e2228 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -265,9 +265,9 @@ ynh_script_progression --message="Upgrading systemd configuration..."
 ynh_add_config --template="../conf/funkwhale.target" --destination="/etc/systemd/system/$app.target"
 
 # Create a dedicated systemd config
-ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service" --others_var="datadir"
-ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service" --others_var="datadir"
-ynh_add_systemd_config --service="${app}-beat"   --template="funkwhale-beat.service" --others_var="datadir"
+ynh_add_systemd_config --service="${app}-server" --template="funkwhale-server.service"
+ynh_add_systemd_config --service="${app}-worker" --template="funkwhale-worker.service"
+ynh_add_systemd_config --service="${app}-beat"   --template="funkwhale-beat.service"
 
 #=================================================
 # GENERIC FINALIZATION