From 611fe6e4ea478fe9777b93edef4046207b0706b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 21 Nov 2022 19:35:40 +0100 Subject: [PATCH] Fix --- scripts/backup | 8 -------- scripts/install | 10 ---------- scripts/remove | 8 -------- scripts/restore | 7 ------- scripts/upgrade | 10 ---------- 5 files changed, 43 deletions(-) diff --git a/scripts/backup b/scripts/backup index 624abcb..6201eec 100755 --- a/scripts/backup +++ b/scripts/backup @@ -44,14 +44,6 @@ ynh_backup --src_path="$final_path" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - -ynh_backup --src_path="/etc/logrotate.d/$app" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index 81dde7c..e742117 100755 --- a/scripts/install +++ b/scripts/install @@ -101,16 +101,6 @@ ynh_add_config --template="../conf/config.sample.json" --destination="$final_pat chmod 660 "$final_path/config.json" chown $app:www-data "$final_path/config.json" -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Configuring log rotation..." --weight=1 - -# Use logrotate to manage application logfile(s) -ynh_use_logrotate - #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/remove b/scripts/remove index d103517..b66e5ec 100755 --- a/scripts/remove +++ b/scripts/remove @@ -20,14 +20,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) port=$(ynh_app_setting_get --app=$app --key=port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -#================================================= -# REMOVE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Removing logrotate configuration..." --weight=1 - -# Remove the app-specific logrotate config -ynh_remove_logrotate - #================================================= # REMOVE APP MAIN DIR #================================================= diff --git a/scripts/restore b/scripts/restore index df5babc..67e9e49 100755 --- a/scripts/restore +++ b/scripts/restore @@ -63,13 +63,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/logrotate.d/$app" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ca6851a..ef96d93 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -100,16 +100,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1 - -# Use logrotate to manage app-specific logfile(s) -ynh_use_logrotate --non-append - #================================================= # END OF SCRIPT #=================================================