From b5f068a7e9b66b304a9971802573b0b8f98b86ee Mon Sep 17 00:00:00 2001 From: Jibec Date: Wed, 2 Jan 2019 12:54:36 +0200 Subject: [PATCH 1/4] fix missing directory after reboot --- conf/systemd.service | 2 ++ manifest.json | 4 ++-- scripts/install | 4 ---- scripts/restore | 2 -- scripts/upgrade | 3 --- 5 files changed, 4 insertions(+), 11 deletions(-) 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 From 60ef2515b18c053f6b02af8bd5545e0c2700d8ae Mon Sep 17 00:00:00 2001 From: Jibec Date: Wed, 2 Jan 2019 13:12:15 +0200 Subject: [PATCH 2/4] restart service on cert update --- hooks/post_cert_update | 7 +++++++ manifest.json | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100755 hooks/post_cert_update diff --git a/hooks/post_cert_update b/hooks/post_cert_update new file mode 100755 index 0000000..a92da95 --- /dev/null +++ b/hooks/post_cert_update @@ -0,0 +1,7 @@ +#!/bin/bash + +domain=$1 +app=$(basename "$0") +app=${app#50-} # all hooks are nammed "50-$app". + +systemctl restart "$app" \ No newline at end of file diff --git a/manifest.json b/manifest.json index e0147ed..4b587f6 100644 --- a/manifest.json +++ b/manifest.json @@ -13,9 +13,9 @@ "email": "jean-baptiste@holcroft.fr" }, "requirements": { - "yunohost": ">= 3.1.0" + "yunohost": ">= 3.4.0" }, - "version": "1.2.8~ynh6", + "version": "1.2.8~ynh7", "multi_instance": true, "services": [ ], From 70ff0edf97cd619fdb39f10a0ceaa9b992d9a56f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Wed, 23 Jan 2019 21:56:27 +0100 Subject: [PATCH 3/4] add badges to readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 6a680e7..a5ebf65 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # Mumble server package for YunoHost +[![Integration level](https://dash.yunohost.org/integration/mumbleserver.svg)](https://dash.yunohost.org/appci/app/mumbleserver) +[![Install Funkwhale 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. Password and other usefull information will be sent to you after installation. From ddfea94b8445e1ff03f8e7fd9d99b60da57636d4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Wed, 23 Jan 2019 21:56:27 +0100 Subject: [PATCH 4/4] add badges to readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 6a680e7..2b7f31a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # Mumble server package 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) + It installs the Debian package and configures it with given settings. Password and other usefull information will be sent to you after installation.