From ff2c5b9deb7d5291622768532eb71a3335d38a2d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Jun 2021 23:36:45 +0200 Subject: [PATCH] Fix --- scripts/restore | 14 +++++++------- scripts/upgrade | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/restore b/scripts/restore index 71c74e6..a357dcf 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app"$app" --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_script_progression --message="Validating restoration parameters..." --time --weight=1 +ynh_script_progression --message="Validating restoration parameters..." --weight=1 ynh_webpath_available --domain=$domain --path_url=$path_url \ || ynh_die --message="Path not available: ${domain}${path_url}" @@ -58,7 +58,7 @@ ynh_restore_file --origin_path="$final_path" # RECREATE THE DEDICATED USER #================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --time --weight=1 +ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 # Create the dedicated user (if not existing) ynh_system_user_create --username="$app" @@ -82,7 +82,7 @@ chown -R :mumble-server "$final_path" #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --time --weight=1 +ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies @@ -106,12 +106,12 @@ systemctl disable mumble-server --quiet 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 +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..." --time --weight=1 +ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable "$app.service" @@ -122,7 +122,7 @@ systemctl enable "$app-web.service" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name="$app" --action="start" ynh_systemd_action --service_name="$app-web" --action="start" @@ -132,7 +132,7 @@ ynh_systemd_action --service_name="$app-web" --action="start" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server..." --time --weight=1 +ynh_script_progression --message="Reloading nginx web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index e80f9b0..d1e689e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -222,7 +222,7 @@ 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 +yunohost service add $app --description="Mumble server" --log="/var/log/$app/$app.log" --needs_exposed_ports=$port #================================================= # START SYSTEMD SERVICE