From f0a628dc6ddd1de04f2bfaa80ec3559234485df0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Dec 2020 16:56:37 +0100 Subject: [PATCH] Fix linter --- scripts/backup | 8 ++++---- scripts/install | 6 +++--- scripts/upgrade | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/backup b/scripts/backup index d8a772f..3c0c590 100644 --- a/scripts/backup +++ b/scripts/backup @@ -32,11 +32,13 @@ domain=$(ynh_app_setting_get --app="$app" --key=domain) db_name=$(ynh_app_setting_get --app="$app" --key=db_name) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_print_info --message="Backing up the main app directory..." backup_core_only=$(ynh_app_setting_get --app="$app" --key=backup_core_only) # If backup_core_only have any value in the settings.yml file, do not backup the data directory @@ -51,7 +53,6 @@ fi #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_print_info --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/nginx/conf.d/$domain.conf" @@ -68,7 +69,6 @@ ynh_psql_dump_db --database="$db_name" > db.sql #================================================= # BACKUP SYSTEMD #================================================= -ynh_print_info --message="Backing up systemd configuration..." ynh_backup --src_path="/etc/systemd/system/$app-beat.service" ynh_backup --src_path="/etc/systemd/system/$app-server.service" diff --git a/scripts/install b/scripts/install index c0a1315..f4ab769 100644 --- a/scripts/install +++ b/scripts/install @@ -212,9 +212,9 @@ chown -R "$app": "/var/log/$app" # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add "$app-server" --log "/var/log/$app/server.log" -yunohost service add "$app-worker" --log "/var/log/$app/worker.log" -yunohost service add "$app-beat" --log "/var/log/$app/beat.log" +yunohost service add "$app-server" --log="/var/log/$app/server.log" +yunohost service add "$app-worker" --log="/var/log/$app/worker.log" +yunohost service add "$app-beat" --log="/var/log/$app/beat.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index e88049c..fc75a1b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -256,6 +256,10 @@ chmod -R 755 "$final_path/code/front/dist/" mkdir -p "/var/log/$app" chown -R "$app": "/var/log/$app" +#================================================= +# ADVERTISE SERVICE IN ADMIN PANEL +#================================================= + yunohost service add "$app-server" --log="/var/log/$app/server.log" yunohost service add "$app-worker" --log="/var/log/$app/worker.log" yunohost service add "$app-beat" --log="/var/log/$app/beat.log"