From 89f5f83b700018eb9d84209ed21d50447c489254 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 4 Jun 2021 23:57:04 +0200
Subject: [PATCH] Fix

---
 manifest.json   | 2 +-
 scripts/backup  | 2 +-
 scripts/install | 6 +++---
 scripts/upgrade | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifest.json b/manifest.json
index 18fdb7b..3746b3b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "Mumble Server",
-    "id": "mumbleserver",
+    "id": "mumble-server",
     "packaging_format": 1,
     "description": {
         "en": "Low-latency, high quality voice chat software (VoIP).",
diff --git a/scripts/backup b/scripts/backup
index 5a0c081..68ba791 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -48,7 +48,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 # BACKUP SYSTEMD
 #=================================================
 
-ynh_backup "/etc/systemd/system/$app.service"
+ynh_backup "/etc/systemd/system/$app-server.service"
 ynh_backup "/etc/systemd/system/$app-web.service"
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index efe3b0b..43f6b43 100644
--- a/scripts/install
+++ b/scripts/install
@@ -143,11 +143,11 @@ fi
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
 # Create a dedicated systemd config
-ynh_add_systemd_config --service=mumble-server --template=systemd.service
+ynh_add_systemd_config
 
 if [ "$mumbleweb" -eq 1 ] ; then
 	ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/mumble-web.service"
-	ynh_add_systemd_config --service=mumble-web --template=mumble-web.service
+	ynh_add_systemd_config --service=$app-web --template=mumble-web.service
 fi
 
 #=================================================
@@ -171,7 +171,7 @@ usermod --append --groups ssl-cert mumble-server
 
 # || true temporarily to ignore a bug in murmurd 1.3.0
 # https://github.com/mumble-voip/mumble/issues/3911
-murmurd -ini "$mumble_conf" -supw "$su_passwd" "$instance_id" || true
+murmurd -ini "$final_path/mumble-server.ini" -supw "$su_passwd" "$instance_id" || true
 
 #=================================================
 # Disable default server installed by Debian's package
diff --git a/scripts/upgrade b/scripts/upgrade
index 4dfa668..f3dc28c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -178,11 +178,11 @@ ynh_add_config --template="../conf/mumble-server.ini" --destination="$final_path
 ynh_script_progression --message="Upgrading systemd configuration..." --weight=2
 
 # Create a dedicated systemd config
-ynh_add_systemd_config --service=mumble-server --template=systemd.service
+ynh_add_systemd_config
 
 if [ "$mumbleweb" -eq 1 ] ; then
 	ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/mumble-web.service"
-	ynh_add_systemd_config --service=mumble-web --template=mumble-web.service
+	ynh_add_systemd_config --service=$app-web --template=mumble-web.service
 fi
 
 #=================================================