From 933119bd4f784bbbc5e3b55fa4a3e2c9fd4c1238 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Jun 2021 09:50:40 +0200 Subject: [PATCH] Fix --- scripts/install | 4 ++++ scripts/restore | 19 ++++++++----------- scripts/upgrade | 11 ++++------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/scripts/install b/scripts/install index a8343d6..9a23aa0 100644 --- a/scripts/install +++ b/scripts/install @@ -194,6 +194,8 @@ 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 +# Add Mumble as a YunoHost service +yunohost service add mumble-web --description="Mumble web" --log="/var/log/$app/$app.log" --needs_exposed_ports=$port_web #================================================= # START SYSTEMD SERVICE @@ -202,6 +204,8 @@ 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" +ynh_systemd_action --service_name=mumble-web --action=restart --log_path="/var/log/$app/mumble-web.log" + #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/restore b/scripts/restore index 8844cbb..ee2ab92 100644 --- a/scripts/restore +++ b/scripts/restore @@ -80,15 +80,17 @@ chmod -R 770 "$final_path" chown -R :mumble-server "$final_path" #================================================= -# Add user to ssl-cert so it can read certificates +# ADD USER TO SSL-CERT #================================================= +# Add user to ssl-cert so it can read certificates usermod --append --groups ssl-cert mumble-server #================================================= -# Disable default server installed by Debian's package +# DISABLE DEFAULT SERVER #================================================= +# Disable default server installed by Debian's package systemctl stop mumble-server systemctl disable mumble-server --quiet @@ -99,6 +101,8 @@ 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" --needs_exposed_ports=$port +# Add Mumble as a YunoHost service +yunohost service add mumble-web --description="Mumble web" --log="/var/log/$app/mumble-web.log" --needs_exposed_ports=$port_web #================================================= # RESTORE SYSTEMD @@ -116,8 +120,8 @@ systemctl enable "mumble-web.service" --quiet #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name="$app" --action="start" -ynh_systemd_action --service_name="mumble-web" --action="start" +ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="mumble-web" --action="start" --log_path="/var/log/$app/mumble-web.log" #================================================= # GENERIC FINALIZATION @@ -128,13 +132,6 @@ ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload -#================================================= -# 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 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 34888b5..185d57d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -221,19 +221,16 @@ systemctl disable mumble-server --quiet # Add Mumble as a YunoHost service yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports=$port - -#================================================= -# START SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=3 +# Add Mumble as a YunoHost service +yunohost service add mumble-web --description="Mumble web" --log="/var/log/$app/mumble-web.log" --needs_exposed_ports=$port_web #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name="$app" --action="start" -ynh_systemd_action --service_name="mumble-web" --action="start" +ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="mumble-web" --action="start" --log_path="/var/log/$app/mumble-web.log" #================================================= # RELOAD NGINX