From 6ab9c0a2ecfa01c73b796e5da43d4ce518b84206 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 1 Aug 2020 23:53:10 +0200
Subject: [PATCH 01/18] clean up

---
 README.md          |  1 -
 scripts/_common.sh | 20 ++++++++++++++++++++
 scripts/install    | 13 +++++++------
 scripts/upgrade    |  6 ++++++
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 2b7f31a..da8e852 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,6 @@ Password and other usefull information will be sent to you after installation.
 - [Add the admin](http://wiki.mumble.info/wiki/Murmurguide#Connecting_to_Murmur_Server)
 
 #### Maintainers & history
-----------------
 
 * 2014: Package creation was maid by [matlink]](https://github.com/Matlink)
 * 2016: improved and maintained by [Moul](https://github.com/M5oul)
diff --git a/scripts/_common.sh b/scripts/_common.sh
index fba63ec..7eda170 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,5 +1,25 @@
 #!/bin/bash
 
+#=================================================
+# COMMON VARIABLES
+#=================================================
+
+# dependencies used by the app
+pkg_dependencies="mumble-server mailutils"
+
+#=================================================
+# PERSONAL HELPERS
+#=================================================
+
+#=================================================
+# EXPERIMENTAL HELPERS
+#=================================================
+
+#=================================================
+# FUTURE OFFICIAL HELPERS
+#=================================================
+
+
 # Send an email to inform the administrator
 #
 # usage: ynh_send_readme_to_admin app_message [recipients]
diff --git a/scripts/install b/scripts/install
index b202953..3424aa5 100644
--- a/scripts/install
+++ b/scripts/install
@@ -59,7 +59,7 @@ ynh_app_setting_set "$app" instance_id     "$instance_id"
 #=================================================
 
 port=$(ynh_find_port 64738)
-ynh_app_setting_set "$app" port "$port"
+ynh_app_setting_set --app=$app --key=port --value=$port
 
 # Open port in firewall
 yunohost firewall allow Both "$port"
@@ -69,7 +69,8 @@ yunohost firewall allow Both "$port"
 #=================================================
 
 # Install Mumble Debian package via apt
-ynh_install_app_dependencies mumble-server mailutils
+
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # SPECIFIC SETUP
@@ -109,13 +110,13 @@ ynh_add_systemd_config
 #=================================================
 
 chmod -R 770 "$final_path"
-chown -R :mumble-server "$final_path"
+chown -R :$app "$final_path"
 
 #=================================================
 # Add user to ssl-cert so it can read certificates
 #=================================================
 
-usermod --append --groups ssl-cert mumble-server
+usermod --append --groups ssl-cert $app
 
 #=================================================
 # Set SuperUser password
@@ -129,8 +130,8 @@ murmurd -ini "$mumble_conf" -supw "$su_passwd" "$instance_id" || true
 # Disable default server installed by Debian's package
 #=================================================
 
-systemctl stop mumble-server
-systemctl disable mumble-server
+systemctl stop $app
+systemctl disable $app
 
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
diff --git a/scripts/upgrade b/scripts/upgrade
index a257cd2..d269e51 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -211,3 +211,9 @@ Are you facing an issue, want to improve this app or say thank you?
 Please open a new issue in this project: https://github.com/YunoHost-Apps/mumbleserver_ynh
 "
 ynh_send_readme_to_admin "$message"
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Upgrade of $app completed" --last

From edbfa2b313dc603c524479e6b4f0a9fbfc439047 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 2 Aug 2020 00:00:11 +0200
Subject: [PATCH 02/18] clean up

---
 README.md            |  2 +-
 conf/systemd.service |  4 ++--
 scripts/backup       | 22 ++++++++++++++--------
 scripts/install      | 27 +++++++++++++++++----------
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index da8e852..ecf128a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Mumble server package for YunoHost
+# Mumble server for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/mumbleserver.svg)](https://dash.yunohost.org/appci/app/mumbleserver)  
 [![Install with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=mumbleserver)
diff --git a/conf/systemd.service b/conf/systemd.service
index c2bb296..31275cd 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -4,8 +4,8 @@ Requires=network-online.target
 After=network.target
 
 [Service]
-User=mumble-server
-Group=mumble-server
+User=__APP__
+Group=__APP__
 Type=forking
 # https://www.freedesktop.org/software/systemd/man/systemd.exec.html#RuntimeDirectory=
 RuntimeDirectory=mumble-server
diff --git a/scripts/backup b/scripts/backup
index bf8bc99..1f89b94 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -6,12 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
-	# Get the _common.sh file if it's not in the current directory
-	cp ../settings/scripts/_common.sh ./_common.sh
-	chmod a+rx _common.sh
-fi
-source _common.sh
+source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -21,14 +16,19 @@ source /usr/share/yunohost/helpers
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-
 #=================================================
 # LOAD SETTINGS
 #=================================================
+ynh_print_info --message="Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
-final_path=$(ynh_app_setting_get $app final_path)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+
+#=================================================
+# DECLARE DATA AND CONF FILES TO BACKUP
+#=================================================
+ynh_print_info --message="Declaring files to be backed up..."
 
 #=================================================
 # STANDARD BACKUP STEPS
@@ -43,3 +43,9 @@ ynh_backup "$final_path"
 #=================================================
 
 ynh_backup "/etc/systemd/system/$app.service"
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
diff --git a/scripts/install b/scripts/install
index 3424aa5..b54b615 100644
--- a/scripts/install
+++ b/scripts/install
@@ -44,13 +44,13 @@ test ! -e "$final_path" || ynh_die "This path already contains a folder"
 #=================================================
 
 # Save app settings
-ynh_app_setting_set "$app" domain          "$domain"
-ynh_app_setting_set "$app" no_sso          "true"
-ynh_app_setting_set "$app" server_password "$server_password"
-ynh_app_setting_set "$app" su_passwd       "$su_passwd"
-ynh_app_setting_set "$app" welcometext     "$welcometext"
-ynh_app_setting_set "$app" registerName    "$registerName"
-ynh_app_setting_set "$app" instance_id     "$instance_id"
+ynh_app_setting_set --app=$app --key=domain          --value="$domain"
+ynh_app_setting_set --app=$app --key=no_sso          --value="true"
+ynh_app_setting_set --app=$app --key=server_password --value="$server_password"
+ynh_app_setting_set --app=$app --key=su_passwd       --value="$su_passwd"
+ynh_app_setting_set --app=$app --key=welcometext     --value="$welcometext"
+ynh_app_setting_set --app=$app --key=registerName    --value="$registerName"
+ynh_app_setting_set --app=$app --key=instance_id     --value="$instance_id"
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -79,7 +79,7 @@ ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 
 mkdir -p "$final_path"
-ynh_app_setting_set "$app" final_path "$final_path"
+ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 
 # Configuring with given settings
 mumble_conf="$final_path/mumble-server.ini"
@@ -134,11 +134,12 @@ systemctl stop $app
 systemctl disable $app
 
 #=================================================
-# ADVERTISE SERVICE IN ADMIN PANEL
+# INTEGRATE SERVICE IN YUNOHOST
 #=================================================
+ynh_script_progression --message="Integrating service in YunoHost..."
 
 # Add Mumble as a YunoHost service
-yunohost service add "$app" -l "/var/log/mumble-server/$app.log"
+yunohost service add $app --description "Mumble server" --log="/var/log/$app/$app.log"
 
 systemctl restart "$app"
 
@@ -162,3 +163,9 @@ Are you facing an issue, want to improve this app or say thank you?
 Please open a new issue in this project: https://github.com/YunoHost-Apps/mumbleserver_ynh
 "
 ynh_send_readme_to_admin "$message"
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Installation of $app completed" --last

From cc45e0bc12941e4c7489183a505b62a92d4537a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 11 Sep 2020 23:24:50 +0200
Subject: [PATCH 03/18] Update README.md

_ *Add badges*
---
 README.md | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2b7f31a..ae2c6cc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Mumble server package for YunoHost
+# Mumble server for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/mumbleserver.svg)](https://dash.yunohost.org/appci/app/mumbleserver)  
+[![Integration level](https://dash.yunohost.org/integration/mumbleserver.svg)](https://dash.yunohost.org/appci/app/mumbleserver) ![](https://ci-apps.yunohost.org/ci/badges/mumbleserver.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mumbleserver.maintain.svg)  
 [![Install with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=mumbleserver)
 
 It installs the Debian package and configures it with given settings.
@@ -12,7 +12,6 @@ Password and other usefull information will be sent to you after installation.
 - [Add the admin](http://wiki.mumble.info/wiki/Murmurguide#Connecting_to_Murmur_Server)
 
 #### Maintainers & history
-----------------
 
 * 2014: Package creation was maid by [matlink]](https://github.com/Matlink)
 * 2016: improved and maintained by [Moul](https://github.com/M5oul)
@@ -39,3 +38,17 @@ Password and other usefull information will be sent to you after installation.
  * Report a bug about Mumble itself: https://github.com/mumble-voip/mumble
  * Mumble website: https://mumble.info
  * YunoHost website: https://yunohost.org
+ 
+ ---
+
+## Developer info
+
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/mumbleserver_ynh/tree/testing).
+
+To try the testing branch, please proceed like that.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/mumbleserver_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade mumbleserver -u https://github.com/YunoHost-Apps/mumbleserver_ynh/tree/testing --debug
+```
+

From a6807a7e80f97e266e8a35fed9cf57d428bfa52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 4 Nov 2020 22:35:27 +0100
Subject: [PATCH 04/18] Update manifest.json

---
 manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 4b587f6..cd2c274 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
     "id": "mumbleserver",
     "packaging_format": 1,
     "description": {
-        "en": "Mumble is a libre, low-latency, high quality voice chat software primarily intended for use while gaming.",
-        "fr": "Mumble est un logiciel libre de voix sur IP (VoIP), son principal usage étant la communication pendant les parties de jeux en réseau."
+        "en": "Low-latency, high quality voice chat software (VoIP).",
+        "fr": "Logiciel libre de voix sur IP (VoIP)."
     },
     "url": "https://mumble.info",
     "license": "BSD-3-Clause",

From d9385b38a78c3dff26bf440c4f5e8caa2f9c0f60 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 9 Nov 2020 19:31:21 +0100
Subject: [PATCH 05/18] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ecf128a..eb438dd 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Password and other usefull information will be sent to you after installation.
 * 2016: improved and maintained by [Moul](https://github.com/M5oul)
 * 2018: full rewrite and now maintained by [Jibec](https://github.com/Jibec)
 
-**Shipped version:** 1.2.8 (source package provided by Debian) 
+**Shipped version:** 1.3.0
 
 # State of this package
 

From 7ba6701e8775ef6dbbb8b5733e108b2d23bc46e7 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 9 Nov 2020 19:37:07 +0100
Subject: [PATCH 06/18] Fix

---
 README.md       | 4 ----
 scripts/restore | 9 ++-------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index eb438dd..0dda1be 100644
--- a/README.md
+++ b/README.md
@@ -21,10 +21,6 @@ Password and other usefull information will be sent to you after installation.
 
 # State of this package
 
-* works fine:
-
-  * [x] install/remove/backup/remove/upgrade/multi-instance with x86_64
-
 * to be confirmed
   * [x] ARM support
   * [x] Improve systemd protection
diff --git a/scripts/restore b/scripts/restore
index 414c8c6..cadf1d0 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,12 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
-	# Get the _common.sh file if it's not in the current directory
-	cp ../settings/scripts/_common.sh ./_common.sh
-	chmod a+rx _common.sh
-fi
-source _common.sh
+source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -51,7 +46,7 @@ ynh_restore_file "$final_path"
 #=================================================
 
 # Define and install dependencies
-ynh_install_app_dependencies mumble-server mailutils
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # RESTORE USER RIGHTS

From 84ff5383b21829909b9af6904a42e65f9ff0cb3e Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 19 Nov 2020 19:30:35 +0100
Subject: [PATCH 07/18] fix

---
 check_process      | 10 ----------
 scripts/_common.sh |  1 -
 scripts/backup     |  1 -
 scripts/install    | 19 +++++++++++--------
 scripts/restore    |  8 +++++++-
 scripts/upgrade    | 28 ++++++++++++++++++----------
 6 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/check_process b/check_process
index d0c50d7..efd1980 100644
--- a/check_process
+++ b/check_process
@@ -20,17 +20,7 @@
 		incorrect_path=0
 		port_already_use=0
 ;;; Levels
-	Level 1=auto
-	Level 2=auto
-	Level 3=auto
-	# https://github.com/YunoHost-Apps/mumbleserver_ynh/issues/11
-	Level 4=1
 	Level 5=auto
-	Level 6=auto
-	Level 7=auto
-	Level 8=0
-	Level 9=0
-	Level 10=0
 ;;; Options
 Email=jean-baptiste@holcroft.fr
 Notification=all
\ No newline at end of file
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 7eda170..f37c864 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -80,4 +80,3 @@ $(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')"
 	# Send the email to the recipients
 	echo "$mail_message" | $mail_bin -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients"
 }
-
diff --git a/scripts/backup b/scripts/backup
index 1f89b94..68b7974 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -13,7 +13,6 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-# Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index b54b615..8bcb77e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -35,6 +35,7 @@ su_passwd=$(ynh_string_random)
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
+ynh_script_progression --message="Validating installation parameters..." --weight=1
 
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die "This path already contains a folder"
@@ -42,6 +43,7 @@ test ! -e "$final_path" || ynh_die "This path already contains a folder"
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
+ynh_script_progression --message="Storing installation settings..." --weight=2
 
 # Save app settings
 ynh_app_setting_set --app=$app --key=domain          --value="$domain"
@@ -57,6 +59,7 @@ ynh_app_setting_set --app=$app --key=instance_id     --value="$instance_id"
 #=================================================
 # FIND AND OPEN A PORT
 #=================================================
+ynh_script_progression --message="Configuring firewall..." --weight=1
 
 port=$(ynh_find_port 64738)
 ynh_app_setting_set --app=$app --key=port --value=$port
@@ -67,9 +70,9 @@ yunohost firewall allow Both "$port"
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
+ynh_script_progression --message="Installing dependencies..." --weight=4
 
 # Install Mumble Debian package via apt
-
 ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
@@ -86,13 +89,13 @@ mumble_conf="$final_path/mumble-server.ini"
 
 cp ../conf/mumble-server.ini "$mumble_conf"
 
-ynh_replace_string "__FINALPATH__" "$final_path"     "$mumble_conf"
-ynh_replace_string "__APP__"      "$app"             "$mumble_conf"
-ynh_replace_string "__WELCOME__"  "$welcometext"     "$mumble_conf"
-ynh_replace_string "__PORT__"     "$port"            "$mumble_conf"
-ynh_replace_string "__SRV_PWD__"  "$server_password" "$mumble_conf"
-ynh_replace_string "__REGISTER__" "$registerName"    "$mumble_conf"
-ynh_replace_string "__DOMAIN__"   "$domain"          "$mumble_conf"
+ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path"      --target_file="$mumble_conf"
+ynh_replace_string --match_string="__APP__"       --replace_string="$app"             --target_file="$mumble_conf"
+ynh_replace_string --match_string="__WELCOME__"   --replace_string="$welcometext"     --target_file="$mumble_conf"
+ynh_replace_string --match_string="__PORT__"      --replace_string="$port"            --target_file="$mumble_conf"
+ynh_replace_string --match_string="__SRV_PWD__"   --replace_string="$server_password" --target_file="$mumble_conf"
+ynh_replace_string --match_string="__REGISTER__"  --replace_string="$registerName"    --target_file="$mumble_conf"
+ynh_replace_string --match_string="__DOMAIN__"    --replace_string="$domain"          --target_file="$mumble_conf"
 
 ynh_store_file_checksum "$mumble_conf"
 
diff --git a/scripts/restore b/scripts/restore
index cadf1d0..4059be9 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -13,7 +13,6 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-# Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
 #=================================================
@@ -84,3 +83,10 @@ ynh_restore_file "/etc/systemd/system/$app.service"
 systemctl enable "$app.service"
 
 systemctl restart "$app"
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Restoration completed for $app" --last
+
diff --git a/scripts/upgrade b/scripts/upgrade
index d269e51..07489dc 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -5,13 +5,14 @@
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
+
 source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
 # LOAD SETTINGS
 #=================================================
-
+ynh_script_progression --message="Loading installation settings..." --weight=1
 app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get "$app" domain)
@@ -24,6 +25,12 @@ port=$(ynh_app_setting_get "$app" port)
 final_path=$(ynh_app_setting_get "$app" final_path)
 instance_id=$(ynh_app_setting_get "$app" instance_id)
 
+#=================================================
+# CHECK VERSION
+#=================================================
+
+upgrade_type=$(ynh_check_app_version_changed)
+
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -90,10 +97,10 @@ if [ -z "$instance_id" ]; then
 	ynh_app_setting_set "$app" instance_id "$instance_id"
 fi
 
-
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=5
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -114,9 +121,10 @@ ynh_abort_if_errors
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
+ynh_script_progression --message="Upgrading dependencies..." --weight=6
 
 # Install Mumble Debian package via apt
-ynh_install_app_dependencies mumble-server mailutils
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -133,13 +141,13 @@ ynh_backup_if_checksum_is_different "$mumble_conf"
 
 cp ../conf/mumble-server.ini "$mumble_conf"
 
-ynh_replace_string "__FINALPATH__" "$final_path"     "$mumble_conf"
-ynh_replace_string "__APP__"      "$app"             "$mumble_conf"
-ynh_replace_string "__WELCOME__"  "$welcometext"     "$mumble_conf"
-ynh_replace_string "__PORT__"     "$port"            "$mumble_conf"
-ynh_replace_string "__SRV_PWD__"  "$server_password" "$mumble_conf"
-ynh_replace_string "__REGISTER__" "$registerName"    "$mumble_conf"
-ynh_replace_string "__DOMAIN__"   "$domain"          "$mumble_conf"
+ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path"      --target_file="$mumble_conf"
+ynh_replace_string --match_string="__APP__"       --replace_string="$app"             --target_file="$mumble_conf"
+ynh_replace_string --match_string="__WELCOME__"   --replace_string="$welcometext"     --target_file="$mumble_conf"
+ynh_replace_string --match_string="__PORT__"      --replace_string="$port"            --target_file="$mumble_conf"
+ynh_replace_string --match_string="__SRV_PWD__"   --replace_string="$server_password" --target_file="$mumble_conf"
+ynh_replace_string --match_string="__REGISTER__"  --replace_string="$registerName"    --target_file="$mumble_conf"
+ynh_replace_string --match_string="__DOMAIN__"    --replace_string="$domain"          --target_file="$mumble_conf"
 
 ynh_store_file_checksum "$mumble_conf"
 

From 4fc6c6e6b0767702005c10979f0a9c6d54907d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 17 Dec 2020 21:37:30 +0100
Subject: [PATCH 08/18] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b0a556b..7bdab64 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Mumble server for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/mumbleserver.svg)](https://dash.yunohost.org/appci/app/mumbleserver) ![](https://ci-apps.yunohost.org/ci/badges/mumbleserver.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mumbleserver.maintain.svg)  
-[![Install with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=mumbleserver)
+[![Install with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mumbleserver)
 
 It installs the Debian package and configures it with given settings.
 
@@ -17,7 +17,7 @@ Password and other usefull information will be sent to you after installation.
 * 2016: improved and maintained by [Moul](https://github.com/M5oul)
 * 2018: full rewrite and now maintained by [Jibec](https://github.com/Jibec)
 
-**Shipped version:** 1.3.0
+**Shipped version:** 1.3.0 (source package provided by Debian)
 
 # State of this package
 

From a1ae3118fc9a4648f8c6fa316be2845081ffbc6f Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Jan 2021 13:08:11 +0100
Subject: [PATCH 09/18] Fix

---
 conf/systemd.service |  4 ++--
 scripts/install      |  4 ++--
 scripts/remove       |  6 +++---
 scripts/restore      |  2 +-
 scripts/upgrade      | 30 +++++++++++++++---------------
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 31275cd..c2bb296 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -4,8 +4,8 @@ Requires=network-online.target
 After=network.target
 
 [Service]
-User=__APP__
-Group=__APP__
+User=mumble-server
+Group=mumble-server
 Type=forking
 # https://www.freedesktop.org/software/systemd/man/systemd.exec.html#RuntimeDirectory=
 RuntimeDirectory=mumble-server
diff --git a/scripts/install b/scripts/install
index 8bcb77e..dc546cb 100644
--- a/scripts/install
+++ b/scripts/install
@@ -113,7 +113,7 @@ ynh_add_systemd_config
 #=================================================
 
 chmod -R 770 "$final_path"
-chown -R :$app "$final_path"
+chown -R :mumble-server "$final_path"
 
 #=================================================
 # Add user to ssl-cert so it can read certificates
@@ -134,7 +134,7 @@ murmurd -ini "$mumble_conf" -supw "$su_passwd" "$instance_id" || true
 #=================================================
 
 systemctl stop $app
-systemctl disable $app
+systemctl disable $app --quiet
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
diff --git a/scripts/remove b/scripts/remove
index 30e8f7c..ef0daad 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -15,9 +15,9 @@ source /usr/share/yunohost/helpers
 
 app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_get "$app" domain)
-port=$(ynh_app_setting_get "$app" port)
-final_path=$(ynh_app_setting_get "$app" final_path)
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+port=$(ynh_app_setting_get --app=$app --key=port)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
 # STANDARD REMOVE
diff --git a/scripts/restore b/scripts/restore
index 4059be9..1baf0a0 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -80,7 +80,7 @@ yunohost service add "$app" -l "/var/log/mumble-server/$app.log"
 #=================================================
 
 ynh_restore_file "/etc/systemd/system/$app.service"
-systemctl enable "$app.service"
+systemctl enable "$app.service" --quiet
 
 systemctl restart "$app"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 07489dc..aba523a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -15,15 +15,15 @@ source /usr/share/yunohost/helpers
 ynh_script_progression --message="Loading installation settings..." --weight=1
 app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_get "$app" domain)
-no_sso=$(ynh_app_setting_get "$app" no_sso)
-server_password=$(ynh_app_setting_get "$app" server_password)
-su_passwd=$(ynh_app_setting_get "$app" su_passwd)
-welcometext=$(ynh_app_setting_get "$app" welcometext)
-registerName=$(ynh_app_setting_get "$app" registerName)
-port=$(ynh_app_setting_get "$app" port)
-final_path=$(ynh_app_setting_get "$app" final_path)
-instance_id=$(ynh_app_setting_get "$app" instance_id)
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+no_sso=$(ynh_app_setting_get --app=$app --key=no_sso)
+server_password=$(ynh_app_setting_get --app=$app --key=server_password)
+su_passwd=$(ynh_app_setting_get --app=$app --key=su_passwd)
+welcometext=$(ynh_app_setting_get --app=$app --key=welcometext)
+registerName=$(ynh_app_setting_get --app=$app --key=registerName)
+port=$(ynh_app_setting_get --app=$app --key=port)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+instance_id=$(ynh_app_setting_get --app=$app --key=instance_id)
 
 #=================================================
 # CHECK VERSION
@@ -65,11 +65,11 @@ if [ -z "$server_password" ]; then
 		| head -1 \
 		| sed -r "s/.* (([a-z])*\.([a-z])*).*/\1/g")
 
-	ynh_app_setting_set "$app" server_password "$server_password"
-	ynh_app_setting_set "$app" welcometext     "$welcometext"
-	ynh_app_setting_set "$app" registerName    "$registerName"
-	ynh_app_setting_set "$app" su_passwd       "$su_passwd"
-	ynh_app_setting_set "$app" domain          "$domain"
+	ynh_app_setting_set --app=$app --key=server_password --value=$server_password
+	ynh_app_setting_set --app=$app --key=welcometext     --value=$welcometext
+	ynh_app_setting_set --app=$app --key=registerName    --value=$registerName
+	ynh_app_setting_set --app=$app --key=su_passwd       --value=$su_passwd
+	ynh_app_setting_set --app=$app --key=domain          --value=$domain
 
 	systemctl stop mumble-server
 	dpkg-reconfigure mumble-server --frontend=Noninteractive
@@ -186,7 +186,7 @@ murmurd -ini "$mumble_conf" -supw "$su_passwd" "$instance_id" || true
 #=================================================
 
 systemctl stop mumble-server
-systemctl disable mumble-server
+systemctl disable mumble-server --quiet
 
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL

From a5ea0ad42851a9cb1a2e29d4bea193ef4564d0a1 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Jan 2021 13:17:33 +0100
Subject: [PATCH 10/18] Fix linter warning

---
 manifest.json   | 43 +++++++++++++++++++++++--------------------
 scripts/restore |  4 ++--
 scripts/upgrade |  4 ++--
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/manifest.json b/manifest.json
index cd2c274..dc1b023 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,6 +6,7 @@
         "en": "Low-latency, high quality voice chat software (VoIP).",
         "fr": "Logiciel libre de voix sur IP (VoIP)."
     },
+    "version": "1.2.8~ynh7",
     "url": "https://mumble.info",
     "license": "BSD-3-Clause",
     "maintainer": {
@@ -13,39 +14,41 @@
         "email": "jean-baptiste@holcroft.fr"
     },
     "requirements": {
-        "yunohost": ">= 3.4.0"
+        "yunohost": ">= 3.8.1"
     },
-    "version": "1.2.8~ynh7",
     "multi_instance": true,
     "services": [
     ],
     "arguments": {
         "install" : [
 	   {
-    	        "name": "domain",
-	        "type": "domain",
-	        "ask": {
-                    "en": "Choose a domain (used to select the correct certificate)"
+            "name": "domain",
+            "type": "domain",
+            "ask": {
+                "en": "Choose a domain (used to select the correct certificate)",
+                "fr": "Choisissez un domaine (utilisé pour sélectionner le bon certificat)"
 	        },
 	        "example": "domain.org"
 	    },
             {
-                "name": "welcometext",
-                "ask": {
-                    "en": "Choose a welcome text for your server",
-                    "fr": "Choisissez un message de bienvenue pour le serveur"
-                },
-                "example": "Welcome to my mumble server",
-                "default": "Welcome"
+            "name": "welcometext",
+            "type": "string",
+            "ask": {
+                "en": "Choose a welcome text for your server",
+                "fr": "Choisissez un message de bienvenue pour le serveur"
+            },
+            "example": "Welcome to my Mumble server",
+            "default": "Welcome"
             },
             {
-                "name": "registername",
-                "ask": {
-                    "en": "Choose a name for the root channel (your mumble server name)",
-                    "fr": "Entrez un nom pour le channel racine (le nom de votre serveur mumble)"
-                },
-                "example": "Root",
-                "default": "Root"
+            "name": "registername",
+            "type": "string",
+            "ask": {
+                "en": "Choose a name for the root channel (your Mumble server name)",
+                "fr": "Entrez un nom pour le channel racine (le nom de votre serveur Mumble)"
+            },
+            "example": "Root",
+            "default": "Root"
             }
         ]
     }
diff --git a/scripts/restore b/scripts/restore
index 1baf0a0..099e705 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -66,14 +66,14 @@ usermod --append --groups ssl-cert mumble-server
 #=================================================
 
 systemctl stop mumble-server
-systemctl disable mumble-server
+systemctl disable mumble-server --quiet
 
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
 
 # Add Mumble as a YunoHost service
-yunohost service add "$app" -l "/var/log/mumble-server/$app.log"
+yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log"
 
 #=================================================
 # RESTORE SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index aba523a..dc094e3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -74,7 +74,7 @@ if [ -z "$server_password" ]; then
 	systemctl stop mumble-server
 	dpkg-reconfigure mumble-server --frontend=Noninteractive
 	systemctl stop mumble-server
-	systemctl disable mumble-server
+	systemctl disable mumble-server --quiet
 fi
 
 # Fix SSO issue
@@ -193,7 +193,7 @@ systemctl disable mumble-server --quiet
 #=================================================
 
 # Add Mumble as a YunoHost service
-yunohost service add "$app" -l "/var/log/mumble-server/$app.log"
+yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log"
 
 systemctl restart "$app"
 

From df993bbf379c199db32c59c5c063ac32c8c2eaa8 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Jan 2021 13:18:29 +0100
Subject: [PATCH 11/18] Update check_process

---
 check_process | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/check_process b/check_process
index efd1980..1a5b290 100644
--- a/check_process
+++ b/check_process
@@ -17,10 +17,7 @@
 		multi_instance=1
 		wrong_user=0
 		wrong_path=0
-		incorrect_path=0
 		port_already_use=0
-;;; Levels
-	Level 5=auto
 ;;; Options
 Email=jean-baptiste@holcroft.fr
 Notification=all
\ No newline at end of file

From a49cfdc2b5478d7bfe4376050a5455c1d2f2d868 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Jan 2021 13:20:55 +0100
Subject: [PATCH 12/18] Update install

---
 scripts/install | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index dc546cb..14435c0 100644
--- a/scripts/install
+++ b/scripts/install
@@ -119,7 +119,7 @@ chown -R :mumble-server "$final_path"
 # Add user to ssl-cert so it can read certificates
 #=================================================
 
-usermod --append --groups ssl-cert $app
+usermod --append --groups ssl-cert mumble-server
 
 #=================================================
 # Set SuperUser password
@@ -133,8 +133,8 @@ murmurd -ini "$mumble_conf" -supw "$su_passwd" "$instance_id" || true
 # Disable default server installed by Debian's package
 #=================================================
 
-systemctl stop $app
-systemctl disable $app --quiet
+systemctl stop mumble-server
+systemctl disable mumble-server --quiet
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
@@ -142,7 +142,7 @@ systemctl disable $app --quiet
 ynh_script_progression --message="Integrating service in YunoHost..."
 
 # Add Mumble as a YunoHost service
-yunohost service add $app --description "Mumble server" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log"
 
 systemctl restart "$app"
 

From d69f4453c193b8109869192a86e3447d1de3449c Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Jan 2021 13:34:51 +0100
Subject: [PATCH 13/18] Fix linter warnings

---
 scripts/install |  4 ++--
 scripts/remove  | 23 +++++++++++++++++------
 scripts/restore | 25 ++++++++++++++++++-------
 scripts/upgrade | 14 +++++++++++---
 4 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/scripts/install b/scripts/install
index 14435c0..1c34bd7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -73,7 +73,7 @@ yunohost firewall allow Both "$port"
 ynh_script_progression --message="Installing dependencies..." --weight=4
 
 # Install Mumble Debian package via apt
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # SPECIFIC SETUP
@@ -142,7 +142,7 @@ systemctl disable mumble-server --quiet
 ynh_script_progression --message="Integrating service in YunoHost..."
 
 # Add Mumble as a YunoHost service
-yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports $port
 
 systemctl restart "$app"
 
diff --git a/scripts/remove b/scripts/remove
index ef0daad..1a65607 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -12,6 +12,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
+ynh_script_progression --message="Loading installation settings..." --weight=1
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -25,15 +26,17 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 # REMOVE SERVICE FROM ADMIN PANEL
 #=================================================
 
-if yunohost service status | grep -q "$app"
+# Remove the service from the list of services known by Yunohost (added from `yunohost service add`)
+if ynh_exec_warn_less yunohost service status $app >/dev/null
 then
-	echo "Remove $app service"
-	yunohost service remove "$app"
+	ynh_script_progression --message="Removing $app service integration..." --weight=1
+	yunohost service remove $app
 fi
 
 #=================================================
 # STOP AND REMOVE SERVICE
 #=================================================
+ynh_script_progression --message="Stopping and removing the systemd service..." --weight=2
 
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
@@ -41,6 +44,7 @@ ynh_remove_systemd_config
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
+ynh_script_progression --message="Removing dependencies..." --weight=1
 
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
@@ -48,9 +52,10 @@ ynh_remove_app_dependencies
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
+ynh_script_progression --message="Removing app main directory..." --weight=2
 
 # Remove the app directory securely
-ynh_secure_remove "$final_path"
+ynh_secure_remove --file="$final_path"
 
 #=================================================
 # CLOSE A PORT
@@ -58,8 +63,8 @@ ynh_secure_remove "$final_path"
 
 if yunohost firewall list | grep -q "\- $port$"
 then
-	echo "Close port $port"
-	yunohost firewall disallow Both "$port" > /dev/null 2>&1
+	ynh_script_progression --message="Close port $port" --weight=1
+	ynh_exec_warn_less yunohost firewall disallow Both $port
 fi
 
 #=================================================
@@ -69,3 +74,9 @@ fi
 #=================================================
 
 ynh_secure_remove "/var/log/mumble-server/$app.log"
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Removal of $app completed" --last
diff --git a/scripts/restore b/scripts/restore
index 099e705..6aeb760 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -18,14 +18,17 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
+ynh_script_progression --message="Loading installation settings..." --weight=1
 
 app=$YNH_APP_INSTANCE_NAME
 
-final_path=$(ynh_app_setting_get "$app" final_path)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+port=$(ynh_app_setting_get --app=$app --key=port)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
+ynh_script_progression --message="Validating restoration parameters..." --weight=1
 
 test ! -d "$final_path" \
 	|| ynh_die "There is already a directory: $final_path "
@@ -35,14 +38,16 @@ test ! -d "$final_path" \
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
+ynh_script_progression --message="Restoring the app main directory..." --weight=2
 
-ynh_restore_file "$final_path"
+ynh_restore_file --origin_path="$final_path"
 
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=4
 
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies
@@ -71,22 +76,28 @@ systemctl disable mumble-server --quiet
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
 # Add Mumble as a YunoHost service
-yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports $port
 
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
+ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
 
-ynh_restore_file "/etc/systemd/system/$app.service"
-systemctl enable "$app.service" --quiet
+ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
+systemctl enable $app.service --quiet
 
-systemctl restart "$app"
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting a systemd service..." --weight=3
+
+ynh_systemd_action --service_name=$app --action=restart #--log_path="/var/log/$app/$app.log"
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
 ynh_script_progression --message="Restoration completed for $app" --last
-
diff --git a/scripts/upgrade b/scripts/upgrade
index dc094e3..8f939a2 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -13,6 +13,7 @@ source /usr/share/yunohost/helpers
 # LOAD SETTINGS
 #=================================================
 ynh_script_progression --message="Loading installation settings..." --weight=1
+
 app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
@@ -34,6 +35,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
+ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
 # If final_path doesn't exist, create it
 if [ -z "$final_path" ]; then
@@ -124,7 +126,7 @@ ynh_abort_if_errors
 ynh_script_progression --message="Upgrading dependencies..." --weight=6
 
 # Install Mumble Debian package via apt
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -154,6 +156,7 @@ ynh_store_file_checksum "$mumble_conf"
 #=================================================
 # SETUP SYSTEMD
 #=================================================
+ynh_script_progression --message="Upgrading systemd configuration..." --weight=2
 
 # Create a dedicated systemd config
 ynh_add_systemd_config
@@ -193,9 +196,14 @@ systemctl disable mumble-server --quiet
 #=================================================
 
 # Add Mumble as a YunoHost service
-yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports $port
 
-systemctl restart "$app"
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting a systemd service..." --weight=3
+
+ynh_systemd_action --service_name=$app --action=restart #--log_path="/var/log/$app/$app.log"
 
 #=================================================
 # SEND README TO ADMIN

From 6a9348b7a62e3112318ce17844b142ab8b820dc4 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Jan 2021 14:01:09 +0100
Subject: [PATCH 14/18] Fix

---
 scripts/install |  4 ++--
 scripts/restore |  2 +-
 scripts/upgrade | 10 ++--------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/scripts/install b/scripts/install
index 1c34bd7..5d2ef93 100644
--- a/scripts/install
+++ b/scripts/install
@@ -73,7 +73,7 @@ yunohost firewall allow Both "$port"
 ynh_script_progression --message="Installing dependencies..." --weight=4
 
 # Install Mumble Debian package via apt
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # SPECIFIC SETUP
@@ -119,7 +119,7 @@ chown -R :mumble-server "$final_path"
 # Add user to ssl-cert so it can read certificates
 #=================================================
 
-usermod --append --groups ssl-cert mumble-server
+ynh_exec_warn_less usermod --append --groups ssl-cert mumble-server
 
 #=================================================
 # Set SuperUser password
diff --git a/scripts/restore b/scripts/restore
index 6aeb760..339b6c4 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -64,7 +64,7 @@ chown -R :mumble-server "$final_path"
 # Add user to ssl-cert so it can read certificates
 #=================================================
 
-usermod --append --groups ssl-cert mumble-server
+ynh_exec_warn_less usermod --append --groups ssl-cert mumble-server
 
 #=================================================
 # Disable default server installed by Debian's package
diff --git a/scripts/upgrade b/scripts/upgrade
index 8f939a2..d4b95c5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -114,19 +114,13 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-#=================================================
-# STANDARD UPGRADE STEPS
-#=================================================
-
-# source and user are provided by debian's package, no web interface
-
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
 ynh_script_progression --message="Upgrading dependencies..." --weight=6
 
 # Install Mumble Debian package via apt
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -174,7 +168,7 @@ chown -R :mumble-server "$final_path"
 # Add user to ssl-cert so it can read certificates
 #=================================================
 
-usermod --append --groups ssl-cert mumble-server
+ynh_exec_warn_less usermod --append --groups ssl-cert mumble-server
 
 #=================================================
 # Set SuperUser password

From 8dde74fe0a8ccde911a6419630f33f8b1c74054c Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Jan 2021 14:05:00 +0100
Subject: [PATCH 15/18] Fix

---
 scripts/install | 2 +-
 scripts/restore | 2 +-
 scripts/upgrade | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 5d2ef93..b5f4029 100644
--- a/scripts/install
+++ b/scripts/install
@@ -119,7 +119,7 @@ chown -R :mumble-server "$final_path"
 # Add user to ssl-cert so it can read certificates
 #=================================================
 
-ynh_exec_warn_less usermod --append --groups ssl-cert mumble-server
+usermod --append --groups ssl-cert mumble-server
 
 #=================================================
 # Set SuperUser password
diff --git a/scripts/restore b/scripts/restore
index 339b6c4..6aeb760 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -64,7 +64,7 @@ chown -R :mumble-server "$final_path"
 # Add user to ssl-cert so it can read certificates
 #=================================================
 
-ynh_exec_warn_less usermod --append --groups ssl-cert mumble-server
+usermod --append --groups ssl-cert mumble-server
 
 #=================================================
 # Disable default server installed by Debian's package
diff --git a/scripts/upgrade b/scripts/upgrade
index d4b95c5..a045d9c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -168,7 +168,7 @@ chown -R :mumble-server "$final_path"
 # Add user to ssl-cert so it can read certificates
 #=================================================
 
-ynh_exec_warn_less usermod --append --groups ssl-cert mumble-server
+usermod --append --groups ssl-cert mumble-server
 
 #=================================================
 # Set SuperUser password

From 0777618ff2001e0e7fe10769cae3631b54cad1ac Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Jan 2021 15:08:56 +0100
Subject: [PATCH 16/18] Add README_fr

---
 README.md     | 57 ++++++++++++++++++++++++++++--------------
 README_fr.md  | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
 check_process | 10 +++++---
 manifest.json |  8 ++++--
 4 files changed, 119 insertions(+), 25 deletions(-)
 create mode 100644 README_fr.md

diff --git a/README.md b/README.md
index 7bdab64..abc1aed 100644
--- a/README.md
+++ b/README.md
@@ -3,36 +3,56 @@
 [![Integration level](https://dash.yunohost.org/integration/mumbleserver.svg)](https://dash.yunohost.org/appci/app/mumbleserver) ![](https://ci-apps.yunohost.org/ci/badges/mumbleserver.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mumbleserver.maintain.svg)  
 [![Install with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mumbleserver)
 
-It installs the Debian package and configures it with given settings.
+*[Lire ce readme en français.](./README_fr.md)*
 
-Password and other usefull information will be sent to you after installation.
+> *This package allows you to install Mumble server quickly and simply on a YunoHost server.  
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
-#### Setup
-
-- [Add the admin](http://wiki.mumble.info/wiki/Murmurguide#Connecting_to_Murmur_Server)
-
-#### Maintainers & history
-
-* 2014: Package creation was maid by [matlink]](https://github.com/Matlink)
-* 2016: improved and maintained by [Moul](https://github.com/M5oul)
-* 2018: full rewrite and now maintained by [Jibec](https://github.com/Jibec)
+## Overview
+Mumble is a free, open source, low latency, high quality voice chat application. Mumble was the first VoIP application to establish true low latency voice communication over a decade ago. But low latency and gaming are not the only use cases it shines in.
 
 **Shipped version:** 1.3.0 (source package provided by Debian)
 
-# State of this package
+## Screenshots
 
-* to be confirmed
-  * [x] ARM support
-  * [x] Improve systemd protection
+![](https://www.mumble.info/client-screenshots/connected.png)
 
-* to be added:
-  * [ ] Improve log file and add logrotate
+#### Setup
+
+It installs the Debian package and configures it with given settings. Password and other usefull information will be sent to you after installation.
+
+- [Add the admin](http://wiki.mumble.info/wiki/Murmurguide#Connecting_to_Murmur_Server)
+
+## Documentation
+
+ * Official documentation: https://wiki.mumble.info/wiki/Main_Page
+ * YunoHost documentation: If specific documentation is needed, feel free to contribute.
+
+## YunoHost specific features
+
+#### Multi-user support
+
+ * Are LDAP and HTTP auth supported? **No**
+ * Can the app be used by multiple users?
+
+#### Supported architectures
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mumbleserver%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mumbleserver/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mumbleserver%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mumbleserver/)
+
+## Limitations
+
+* Any known limitations.
+
+## Additional information
+
+* Other info you would like to add about this app.
 
 ## Links
 
  * Report a bug about this package: https://github.com/YunoHost-Apps/mumbleserver_ynh
- * Report a bug about Mumble itself: https://github.com/mumble-voip/mumble
  * Mumble website: https://mumble.info
+ * Report a bug about Mumble itself: https://github.com/mumble-voip/mumble
  * YunoHost website: https://yunohost.org
  
  ---
@@ -47,4 +67,3 @@ sudo yunohost app install https://github.com/YunoHost-Apps/mumbleserver_ynh/tree
 or
 sudo yunohost app upgrade mumbleserver -u https://github.com/YunoHost-Apps/mumbleserver_ynh/tree/testing --debug
 ```
-
diff --git a/README_fr.md b/README_fr.md
new file mode 100644
index 0000000..81ea6a8
--- /dev/null
+++ b/README_fr.md
@@ -0,0 +1,69 @@
+# Mumble server pour YunoHost
+
+[![Niveau d'intégration](https://dash.yunohost.org/integration/mumbleserver.svg)](https://dash.yunohost.org/appci/app/mumbleserver) ![](https://ci-apps.yunohost.org/ci/badges/mumbleserver.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mumbleserver.maintain.svg)  
+[![Installer avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mumbleserver)
+
+*[Read this readme in english.](./README.md)* 
+
+> *Ce package vous permet d'installer Mumble server rapidement et simplement sur un serveur YunoHost.  
+Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
+
+## Vue d'ensemble
+Mumble est une application de chat vocal gratuite, open source, à faible latence et de haute qualité. Mumble a été la première application VoIP à établir une véritable communication vocale à faible latence il y a plus de dix ans. Mais la faible latence et le jeu ne sont pas les seuls cas d'utilisation dans lesquels il brille.
+
+**Version incluse :** 1.3.0 (paquet source fourni par Debian)
+
+## Captures d'écran
+
+![](https://www.mumble.info/client-screenshots/connected.png)
+
+## Configuration
+
+Il installe le paquet Debian et le configure avec les paramètres donnés. Le mot de passe et d'autres informations utiles vous seront envoyés après l'installation.
+
+- [Ajouter l'administrateur](http://wiki.mumble.info/wiki/Murmurguide#Connecting_to_Murmur_Server)
+
+## Documentation
+
+ * Documentation officielle : https://wiki.mumble.info/wiki/Main_Page
+ * Documentation YunoHost : Si une documentation spécifique est nécessaire, n'hésitez pas à contribuer.
+
+## Caractéristiques spécifiques YunoHost
+
+#### Support multi-utilisateur
+
+* L'authentification LDAP et HTTP est-elle prise en charge ? **Non**
+* L'application peut-elle être utilisée par plusieurs utilisateurs ? 
+
+#### Architectures supportées
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mumbleserver%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mumbleserver/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mumbleserver%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mumbleserver/)
+
+## Limitations
+
+* Limitations connues.
+
+## Informations additionnelles
+
+* Autres informations que vous souhaitez ajouter sur cette application.
+
+## Liens
+
+ * Signaler un bug : https://github.com/YunoHost-Apps/mumbleserver_ynh
+ * Site de l'application : https://mumble.info
+ * Dépôt de l'application principale : https://github.com/mumble-voip/mumble
+ * Site web YunoHost : https://yunohost.org
+ 
+ ---
+
+## Informations pour les développeurs
+
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/mumbleserver_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/mumbleserver_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade mumbleserver -u https://github.com/YunoHost-Apps/mumbleserver_ynh/tree/testing --debug
+```
diff --git a/check_process b/check_process
index 1a5b290..c9ec543 100644
--- a/check_process
+++ b/check_process
@@ -2,7 +2,7 @@
 	auto_remove=1
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
-		welcometext="Welcome to my mumble server"
+		welcometext="Welcome to my Mumble server"
 		registername="Root"
 	; Checks
 		pkg_linter=1
@@ -12,12 +12,14 @@
 		setup_private=0
 		setup_public=0
 		upgrade=1
-		# latest published in community.json
 		backup_restore=1
 		multi_instance=1
 		wrong_user=0
 		wrong_path=0
 		port_already_use=0
 ;;; Options
-Email=jean-baptiste@holcroft.fr
-Notification=all
\ No newline at end of file
+Email=
+Notification=none
+;;; Upgrade options
+	; commit=CommitHash
+		name=Name and date of the commit.
diff --git a/manifest.json b/manifest.json
index dc1b023..bc23f41 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,13 +6,17 @@
         "en": "Low-latency, high quality voice chat software (VoIP).",
         "fr": "Logiciel libre de voix sur IP (VoIP)."
     },
-    "version": "1.2.8~ynh7",
+    "version": "1.3.0~ynh1",
     "url": "https://mumble.info",
     "license": "BSD-3-Clause",
     "maintainer": {
+        "name": "",
+        "email": ""
+    },
+    "previous_maintainers": [{
         "name": "Jean-Baptiste Holcroft",
         "email": "jean-baptiste@holcroft.fr"
-    },
+    }],
     "requirements": {
         "yunohost": ">= 3.8.1"
     },

From d8c4f515b201e0939f10108d54356f29d8c74954 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Jan 2021 15:14:32 +0100
Subject: [PATCH 17/18] Small typos

---
 README.md            | 2 +-
 README_fr.md         | 2 +-
 conf/systemd.service | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index abc1aed..3c6f3ec 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Mumble is a free, open source, low latency, high quality voice chat application.
 
 #### Setup
 
-It installs the Debian package and configures it with given settings. Password and other usefull information will be sent to you after installation.
+This package installs the Debian package and configures it with given settings. Password and other usefull information will be sent to you after installation.
 
 - [Add the admin](http://wiki.mumble.info/wiki/Murmurguide#Connecting_to_Murmur_Server)
 
diff --git a/README_fr.md b/README_fr.md
index 81ea6a8..cfe8323 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Mumble est une application de chat vocal gratuite, open source, à faible latenc
 
 ## Configuration
 
-Il installe le paquet Debian et le configure avec les paramètres donnés. Le mot de passe et d'autres informations utiles vous seront envoyés après l'installation.
+mumbleserver_ynh installe le paquet Debian et le configure avec les paramètres donnés. Le mot de passe et d'autres informations utiles sont envoyés après l'installation.
 
 - [Ajouter l'administrateur](http://wiki.mumble.info/wiki/Murmurguide#Connecting_to_Murmur_Server)
 
diff --git a/conf/systemd.service b/conf/systemd.service
index c2bb296..ecce853 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Mumble Server (Murmur, app __APP__)
+Description=Mumble Server: voice chat application
 Requires=network-online.target
 After=network.target
 

From a09b46ee7be7fbd3d4646fb5dd522e45c9e38077 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 4 Jan 2021 16:07:55 +0100
Subject: [PATCH 18/18] Update install

---
 scripts/install | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index b5f4029..6201b00 100644
--- a/scripts/install
+++ b/scripts/install
@@ -144,7 +144,12 @@ ynh_script_progression --message="Integrating service in YunoHost..."
 # Add Mumble as a YunoHost service
 yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports $port
 
-systemctl restart "$app"
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting a systemd service..." --weight=3
+
+ynh_systemd_action --service_name=$app --action=restart #--log_path="/var/log/$app/$app.log"
 
 #=================================================
 # SEND README TO ADMIN