diff --git a/conf/systemd.service b/conf/systemd.service index 2ccf9d4..c2bb296 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,6 +7,8 @@ After=network.target User=mumble-server Group=mumble-server Type=forking +# https://www.freedesktop.org/software/systemd/man/systemd.exec.html#RuntimeDirectory= +RuntimeDirectory=mumble-server ExecStart=/usr/sbin/murmurd -ini __FINALPATH__/mumble-server.ini PIDFile=/var/run/mumble-server/__APP__.pid ExecReload=/bin/kill -s HUP $MAINPID diff --git a/manifest.json b/manifest.json index c8cb7e0..e0147ed 100644 --- a/manifest.json +++ b/manifest.json @@ -9,13 +9,13 @@ "url": "https://mumble.info", "license": "BSD-3-Clause", "maintainer": { - "name": "jibec", + "name": "Jean-Baptiste Holcroft", "email": "jean-baptiste@holcroft.fr" }, "requirements": { "yunohost": ">= 3.1.0" }, - "version": "1.2.8~ynh5", + "version": "1.2.8~ynh6", "multi_instance": true, "services": [ ], diff --git a/scripts/install b/scripts/install index 564524a..187085b 100644 --- a/scripts/install +++ b/scripts/install @@ -111,10 +111,6 @@ ynh_add_systemd_config chmod -R 770 "$final_path" chown -R :mumble-server "$final_path" -# Prevent "PID file /var/run/mumble-server/*.pid not readable (yet?) after start." -mkdir -p /var/run/mumble-server/ -chown mumble-server /var/run/mumble-server/ - #================================================= # Add user to ssl-cert so it can read certificates #================================================= diff --git a/scripts/restore b/scripts/restore index 995bc03..414c8c6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -60,8 +60,6 @@ ynh_install_app_dependencies mumble-server mailutils # Restore permissions on app files chmod -R 770 "$final_path" chown -R :mumble-server "$final_path" -# Prevent "PID file /var/run/mumble-server/*.pid not readable (yet?) after start." -chown mumble-server /var/run/mumble-server/ #================================================= # Add user to ssl-cert so it can read certificates diff --git a/scripts/upgrade b/scripts/upgrade index 06547cc..97c1088 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -158,9 +158,6 @@ ynh_add_systemd_config chmod -R 770 "$final_path" chown -R :mumble-server "$final_path" -# Prevent "PID file /var/run/mumble-server/*.pid not readable (yet?) after start." -mkdir -p /var/run/mumble-server/ -chown mumble-server /var/run/mumble-server/ #================================================= # Add user to ssl-cert so it can read certificates