diff --git a/scripts/install b/scripts/install index c7f7b25..bd43072 100644 --- a/scripts/install +++ b/scripts/install @@ -151,7 +151,7 @@ yunohost service add "${app}-worker" --description="${app} celery worker" --log= ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Started" +ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete" ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="ready" diff --git a/scripts/remove b/scripts/remove index 104fb0f..2fb24d9 100644 --- a/scripts/remove +++ b/scripts/remove @@ -39,9 +39,9 @@ fi #================================================= ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1 -ynh_systemd_action --service_name="${app}-beat" --action="stop" --log_path="systemd" --line_match="Stopped $app" -ynh_systemd_action --service_name="${app}-server" --action="stop" --log_path="systemd" --line_match="Stopped $app" -ynh_systemd_action --service_name="${app}-worker" --action="stop" --log_path="systemd" --line_match="Stopped $app" +ynh_systemd_action --service_name="${app}-beat" --action="stop" --log_path="systemd" +ynh_systemd_action --service_name="${app}-server" --action="stop" --log_path="systemd" +ynh_systemd_action --service_name="${app}-worker" --action="stop" --log_path="systemd" # Remove the dedicated systemd config ynh_remove_systemd_config --service="${app}-beat" diff --git a/scripts/restore b/scripts/restore index af8f55a..ae65c8f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -92,7 +92,7 @@ yunohost service add "${app}-worker" --description="${app} celery worker" --log= #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Started" +ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete" ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="ready" diff --git a/scripts/upgrade b/scripts/upgrade index 2ff9135..2f78ea1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,9 +22,9 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --action="stop" --service_name="${app}-beat" --log_path="systemd" --line_match="Stopped" -ynh_systemd_action --action="stop" --service_name="${app}-server" --log_path="systemd" --line_match="Stopped" -ynh_systemd_action --action="stop" --service_name="${app}-worker" --log_path="systemd" --line_match="Stopped" +ynh_systemd_action --action="stop" --service_name="${app}-beat" --log_path="systemd" +ynh_systemd_action --action="stop" --service_name="${app}-server" --log_path="systemd" +ynh_systemd_action --action="stop" --service_name="${app}-worker" --log_path="systemd" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -162,7 +162,7 @@ yunohost service add "${app}-worker" --description="${app} celery worker" --log= ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" --line_match="Started" +ynh_systemd_action --service_name="${app}-beat" --action="start" --log_path="systemd" ynh_systemd_action --service_name="${app}-server" --action="start" --log_path="systemd" --line_match="Application startup complete" ynh_systemd_action --service_name="${app}-worker" --action="start" --log_path="systemd" --line_match="ready"