From 719011aeedfaeb4f2d262c708fbe19ff2cec4d26 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Mon, 23 Mar 2020 23:50:17 +0100 Subject: [PATCH 1/2] Remove fail2ban and logrotate references so the app can be backuped and restored --- scripts/backup | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/backup b/scripts/backup index 243a9c7..3dab43f 100644 --- a/scripts/backup +++ b/scripts/backup @@ -52,19 +52,19 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP FAIL2BAN CONFIGURATION #================================================= -ynh_script_progression --message="Backing up fail2ban configuration..." --time --weight=1 +#ynh_script_progression --message="Backing up fail2ban configuration..." --time --weight=1 -ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" -ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" +#ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" +#ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" #================================================= # SPECIFIC BACKUP #================================================= # BACKUP LOGROTATE #================================================= -ynh_script_progression --message="Backing up logrotate configuration..." --time --weight=1 +#ynh_script_progression --message="Backing up logrotate configuration..." --time --weight=1 -ynh_backup --src_path="/etc/logrotate.d/$app" +#ynh_backup --src_path="/etc/logrotate.d/$app" #================================================= # END OF SCRIPT From 7f05d6e98f9227a4888be39034f1de71e9df74ed Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Mon, 23 Mar 2020 23:53:36 +0100 Subject: [PATCH 2/2] Cleaning - remove unused code --- scripts/backup | 19 ------------------- scripts/change_url | 5 ----- scripts/install | 15 --------------- scripts/remove | 8 -------- scripts/restore | 19 ------------------- 5 files changed, 66 deletions(-) diff --git a/scripts/backup b/scripts/backup index 3dab43f..67886fa 100644 --- a/scripts/backup +++ b/scripts/backup @@ -33,8 +33,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= # STANDARD BACKUP STEPS -#================================================= - #================================================= # BACKUP THE APP MAIN DIR #================================================= @@ -49,23 +47,6 @@ ynh_script_progression --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP FAIL2BAN CONFIGURATION -#================================================= -#ynh_script_progression --message="Backing up fail2ban configuration..." --time --weight=1 - -#ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" -#ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" - -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= -#ynh_script_progression --message="Backing up logrotate configuration..." --time --weight=1 - -#ynh_backup --src_path="/etc/logrotate.d/$app" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/change_url b/scripts/change_url index 3843f0b..640edb7 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -29,11 +29,6 @@ ynh_script_progression --message="Loading installation settings..." --time --wei # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) -# Add settings here as needed by your application -#db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#db_user=$db_name -#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= diff --git a/scripts/install b/scripts/install index 1e940a5..87dcd80 100644 --- a/scripts/install +++ b/scripts/install @@ -74,13 +74,6 @@ ynh_script_progression --message="Configuring nginx web server..." --time --weig # Create a dedicated nginx config ynh_add_nginx_config -#================================================= -# SPECIFIC SETUP -#================================================= -# ... -#================================================= - - #================================================= # GENERIC FINALIZATION #================================================= @@ -90,14 +83,6 @@ ynh_add_nginx_config # Set permissions to app files chown -R root: $final_path -#================================================= -# SETUP FAIL2BAN -#================================================= -#ynh_script_progression --message="Configuring fail2ban..." --time --weight=1 - -# Create a dedicated fail2ban config -#ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login" - #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/remove b/scripts/remove index 19be9f6..6afcd98 100644 --- a/scripts/remove +++ b/scripts/remove @@ -36,14 +36,6 @@ ynh_script_progression --message="Removing nginx web server configuration..." -- # Remove the dedicated nginx config ynh_remove_nginx_config -#================================================= -# REMOVE FAIL2BAN CONFIGURATION -#================================================= -#ynh_script_progression --message="Removing fail2ban configuration..." --time --weight=1 - -# Remove the dedicated fail2ban config -#ynh_remove_fail2ban_config - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 451d666..1c907c3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -64,25 +64,6 @@ ynh_restore_file --origin_path="$final_path" # Restore permissions on app files chown -R root: $final_path -#================================================= -# RESTORE FAIL2BAN CONFIGURATION -#================================================= -#ynh_script_progression --message="Restoring the fail2ban configuration..." --time --weight=1 - -#ynh_restore_file "/etc/fail2ban/jail.d/$app.conf" -#ynh_restore_file "/etc/fail2ban/filter.d/$app.conf" -#ynh_systemd_action --action=restart --service_name=fail2ban - -#================================================= -# SPECIFIC RESTORATION -#================================================= - -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= - -#ynh_restore_file --origin_path="/etc/logrotate.d/$app" - #================================================= # GENERIC FINALIZATION #=================================================