From be482df34fc283074017ffb7b6e730a36c4d1c30 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sat, 2 Nov 2019 14:38:47 +0100 Subject: [PATCH] If it ain't broke, don't fix it --- manifest.json | 2 +- scripts/install | 6 +++--- scripts/remove | 6 +++--- scripts/restore | 6 +++--- scripts/upgrade | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/manifest.json b/manifest.json index 50017d5..7d1cfc6 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "A modern, convivial and free music server" }, - "version": "0.20.1~ynh1", + "version": "0.20.1~ynh2", "url": "https://funkwhale.audio", "license": "AGPL-3.0-or-later", "maintainer": { diff --git a/scripts/install b/scripts/install index bb0d178..2ce874a 100644 --- a/scripts/install +++ b/scripts/install @@ -224,9 +224,9 @@ yunohost service add "$app-beat" --log "/var/log/$app/beat.log" #================================================= ynh_print_info --message="Starting a systemd service..." -ynh_systemd_action --action="start" --service_name="${app}-beat" --log_path="systemd" --line_match="celery beat process" -ynh_systemd_action --action="start" --service_name="${app}-server" --log_path="systemd" --line_match="Listening on TCP address" -ynh_systemd_action --action="start" --service_name="${app}-worker" --log_path="systemd" --line_match="celery worker" +ynh_systemd_action --action="start" --service_name="${app}-beat" +ynh_systemd_action --action="start" --service_name="${app}-server" +ynh_systemd_action --action="start" --service_name="${app}-worker" #================================================= # SETUP FAIL2BAN diff --git a/scripts/remove b/scripts/remove index e9d86dc..e23ea64 100644 --- a/scripts/remove +++ b/scripts/remove @@ -53,9 +53,9 @@ fi #================================================= ynh_print_info --message="Stopping and removing the systemd service" -ynh_systemd_action --action="stop" --service_name="${app}-beat" --log_path="systemd" --line_match="Stopped Funkwhale" -ynh_systemd_action --action="stop" --service_name="${app}-server" --log_path="systemd" --line_match="Stopped Funkwhale" -ynh_systemd_action --action="stop" --service_name="${app}-worker" --log_path="systemd" --line_match="Stopped Funkwhale" +ynh_systemd_action --action="stop" --service_name="${app}-beat" +ynh_systemd_action --action="stop" --service_name="${app}-server" +ynh_systemd_action --action="stop" --service_name="${app}-worker" # Remove the dedicated systemd config ynh_remove_systemd_config --service="$app-server" diff --git a/scripts/restore b/scripts/restore index 98fe8d2..d135d4e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -148,9 +148,9 @@ yunohost service add "$app-beat" --log "/var/log/$app/beat.log" #================================================= ynh_print_info --message="Starting a systemd service..." -ynh_systemd_action --action="start" --service_name="${app}-beat" --log_path="systemd" --line_match="celery beat process" -ynh_systemd_action --action="start" --service_name="${app}-server" --log_path="systemd" --line_match="Listening on TCP address" -ynh_systemd_action --action="start" --service_name="${app}-worker" --log_path="systemd" --line_match="celery worker" +ynh_systemd_action --action="start" --service_name="${app}-beat" +ynh_systemd_action --action="start" --service_name="${app}-server" +ynh_systemd_action --action="start" --service_name="${app}-worker" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 3c1c93e..dc32818 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -104,9 +104,9 @@ fi #================================================= ynh_print_info --message="Stopping a systemd service..." -ynh_systemd_action --action="stop" --service_name="${app}-beat" --log_path="systemd" --line_match="Stopped Funkwhale" -ynh_systemd_action --action="stop" --service_name="${app}-server" --log_path="systemd" --line_match="Stopped Funkwhale" -ynh_systemd_action --action="stop" --service_name="${app}-worker" --log_path="systemd" --line_match="Stopped Funkwhale" +ynh_systemd_action --action="stop" --service_name="${app}-beat" +ynh_systemd_action --action="stop" --service_name="${app}-server" +ynh_systemd_action --action="stop" --service_name="${app}-worker" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -280,9 +280,9 @@ fi #================================================= ynh_print_info --message="Starting a systemd service..." -ynh_systemd_action --action="start" --service_name="${app}-beat" --log_path="systemd" --line_match="celery beat process" -ynh_systemd_action --action="start" --service_name="${app}-server" --log_path="systemd" --line_match="Listening on TCP address" -ynh_systemd_action --action="start" --service_name="${app}-worker" --log_path="systemd" --line_match="celery worker" +ynh_systemd_action --action="start" --service_name="${app}-beat" +ynh_systemd_action --action="start" --service_name="${app}-server" +ynh_systemd_action --action="start" --service_name="${app}-worker" #================================================= # RELOAD NGINX