From f6e5ce6f2b2e9fa5db8a87272d39d806b2292e6a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Dec 2020 13:39:39 +0100 Subject: [PATCH] Fix --- scripts/change_url | 2 +- scripts/restore | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index e94cd80..8fed290 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -114,7 +114,7 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Starting a systemd service..." --weight=6 # Start a systemd service -ynh_systemd_action --action=restart --log_path="systemd" #--line_match="Your Etherpad version is" --timeout="120" #--service_name=$app +ynh_systemd_action --action=restart --log_path="systemd" --line_match="Your Etherpad version is" --timeout="120" #--service_name=$app #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index db2fac2..dba8fb7 100644 --- a/scripts/restore +++ b/scripts/restore @@ -94,15 +94,6 @@ ynh_system_user_create --username=$app --home_dir=$final_path chown -R $app: $final_path chmod 600 $final_path/credentials.json -#================================================= -# RESTORE SYSTEMD -#================================================= -ynh_script_progression --message="Restoring the systemd configuration..." --weight=8 - -#ynh_restore_file --origin_path="/etc -ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service --quiet - #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= @@ -110,12 +101,20 @@ ynh_script_progression --message="Integrating service in YunoHost..." --weight=3 yunohost service add $app --description="Collaborative editor." --log="/var/log/$app/$app.log" +#================================================= +# RESTORE SYSTEMD +#================================================= +ynh_script_progression --message="Restoring the systemd configuration..." --weight=8 + +ynh_restore_file --origin_path="/etc/systemd/system/$app.service" +systemctl enable $app.service --quiet + #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=8 -ynh_systemd_action --service_name=$app --action=restart --log_path="systemd" #--line_match="Your Etherpad version is" --timeout="120" +ynh_systemd_action --service_name=$app --action=restart --log_path="systemd" --line_match="Your Etherpad version is" --timeout="120" #================================================= # GENERIC FINALIZATION