From 9c4ddcca39d9d6d92bd5f9a23978337e48d0a4e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Fri, 26 Jan 2018 21:17:18 +0100
Subject: [PATCH 1/2] Add service name as arg (optionnal)

---
 data/helpers.d/backend | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/data/helpers.d/backend b/data/helpers.d/backend
index 8fef412cf..c04f2230b 100644
--- a/data/helpers.d/backend
+++ b/data/helpers.d/backend
@@ -64,6 +64,10 @@ ynh_remove_logrotate () {
 
 # Create a dedicated systemd config
 #
+# usage: ynh_add_systemd_config [Service name] [Source file]
+# | arg: Service name
+# | arg: Systemd source file (for example appname.service)
+#
 # This will use a template in ../conf/systemd.service
 # and will replace the following keywords with 
 # global variables that should be defined before calling
@@ -74,9 +78,11 @@ ynh_remove_logrotate () {
 #
 # usage: ynh_add_systemd_config
 ynh_add_systemd_config () {
-	finalsystemdconf="/etc/systemd/system/$app.service"
+	local service_name="${1:-$app}"
+
+	finalsystemdconf="/etc/systemd/system/$service_name.service"
 	ynh_backup_if_checksum_is_different "$finalsystemdconf"
-	sudo cp ../conf/systemd.service "$finalsystemdconf"
+	sudo cp ../conf/${2:-systemd.service} "$finalsystemdconf"
 
 	# To avoid a break by set -u, use a void substitution ${var:-}. If the variable is not set, it's simply set with an empty variable.
 	# Substitute in a nginx config file only if the variable is not empty
@@ -89,19 +95,25 @@ ynh_add_systemd_config () {
 	ynh_store_file_checksum "$finalsystemdconf"
 
 	sudo chown root: "$finalsystemdconf"
-	sudo systemctl enable $app
+	sudo systemctl enable $service_name
 	sudo systemctl daemon-reload
 }
 
 # Remove the dedicated systemd config
 #
+# usage: ynh_remove_systemd_config [Service name]
+# | arg: Service name
+#
 # usage: ynh_remove_systemd_config
 ynh_remove_systemd_config () {
-	local finalsystemdconf="/etc/systemd/system/$app.service"
+	local service_name="${1:-$app}"
+
+	local finalsystemdconf="/etc/systemd/system/$service_name.service"
 	if [ -e "$finalsystemdconf" ]; then
-		sudo systemctl stop $app
-		sudo systemctl disable $app
+		sudo systemctl stop $service_name
+		sudo systemctl disable $service_name
 		ynh_secure_remove "$finalsystemdconf"
+		sudo systemctl daemon-reload
 	fi
 }
 

From a975e5e6843c97dbacdc7401fa38d4d1a72922e7 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 26 Jan 2018 22:21:14 +0100
Subject: [PATCH 2/2] Improve comment / helper description

---
 data/helpers.d/backend | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/helpers.d/backend b/data/helpers.d/backend
index c04f2230b..33d87db2c 100644
--- a/data/helpers.d/backend
+++ b/data/helpers.d/backend
@@ -64,13 +64,13 @@ ynh_remove_logrotate () {
 
 # Create a dedicated systemd config
 #
-# usage: ynh_add_systemd_config [Service name] [Source file]
-# | arg: Service name
-# | arg: Systemd source file (for example appname.service)
+# usage: ynh_add_systemd_config [Service name] [Template name]
+# | arg: Service name (optionnal, $app by default)
+# | arg: Name of template file (optionnal, this is 'systemd' by default, meaning ./conf/systemd.service will be used as template)
 #
-# This will use a template in ../conf/systemd.service
-# and will replace the following keywords with 
-# global variables that should be defined before calling
+# This will use the template ../conf/<templatename>.service
+# to generate a systemd config, by replacing the following keywords
+# with global variables that should be defined before calling
 # this helper :
 #
 #   __APP__       by  $app
@@ -102,7 +102,7 @@ ynh_add_systemd_config () {
 # Remove the dedicated systemd config
 #
 # usage: ynh_remove_systemd_config [Service name]
-# | arg: Service name
+# | arg: Service name (optionnal, $app by default)
 #
 # usage: ynh_remove_systemd_config
 ynh_remove_systemd_config () {