diff --git a/scripts/change_url b/scripts/change_url index 6320d98..9432ddf 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -50,7 +50,7 @@ chown root:$app "/etc/cockpit/cockpit.conf" ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index a84aa68..45dbe5f 100644 --- a/scripts/install +++ b/scripts/install @@ -33,7 +33,7 @@ ynh_replace_string --match_string="ListenStream=.*" --replace_string="ListenStre systemctl daemon-reload systemctl restart $app.socket -ynh_add_config --template="../conf/cockpit.conf" --destination="/etc/cockpit/cockpit.conf" +ynh_add_config --template="cockpit.conf" --destination="/etc/cockpit/cockpit.conf" chmod 650 "/etc/cockpit/cockpit.conf" chown root:$app "/etc/cockpit/cockpit.conf" @@ -53,7 +53,7 @@ yunohost service add $app --description="Sysadmin login session in a web browser ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service -ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started" +ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index 050233c..0abc382 100644 --- a/scripts/remove +++ b/scripts/remove @@ -16,7 +16,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 -# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then ynh_script_progression --message="Removing $app service integration..." --weight=1 @@ -25,10 +24,8 @@ fi ynh_remove_systemd_config -# Remove the dedicated NGINX config ynh_remove_nginx_config -# Remove a directory securely ynh_secure_remove --file="/etc/$app" #================================================= diff --git a/scripts/restore b/scripts/restore index 65ebc3a..507b6a0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -44,7 +44,7 @@ yunohost service add $app --description="Sysadmin login session in a web browser #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 -ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started" +ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 4049d4f..d6dfc26 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,7 +58,7 @@ chown root:$app "/etc/cockpit/cockpit.conf" #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=2 -ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started" +ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" #================================================= # END OF SCRIPT