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