From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/3] backup.pl: Remove ABUSECH_BOTNETC2 lists from backup during restore. Date: Thu, 20 Feb 2025 22:13:24 +0100 Message-ID: <20250220211325.3273650-2-adolf.belka@ipfire.org> In-Reply-To: <20250220211325.3273650-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7421767204186911189==" List-Id: --===============7421767204186911189== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - This removes ABUSECH_BOTNETC2 from any backup during a restore in the same = way as done previously with ALIENVAULT and SPAMHAUS_EDROP. Signed-off-by: Adolf Belka --- config/backup/backup.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 4f4273d26..1c8c87d0a 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -252,16 +252,20 @@ restore_backup() { -out /etc/httpd/server.crt &>/dev/null fi =20 - # Remove any entry for ALIENVAULT or SPAMHAUS_EDROP from the ipblocklist mo= dified file + # Remove any entry for ALIENVAULT, SPAMHAUS_EDROP or ABUSECH_BOTNETC2 from = the ipblocklist modified file # and the associated ipblocklist files from the /var/lib/ipblocklist direct= ory sed -i '/ALIENVAULT=3D/d' /var/ipfire/ipblocklist/modified sed -i '/SPAMHAUS_EDROP=3D/d' /var/ipfire/ipblocklist/modified + sed -i '/ABUSECH_BOTNETC2=3D/d' /var/ipfire/ipblocklist/modified if [ -e /var/lib/ipblocklist/ALIENVAULT.conf ]; then rm /var/lib/ipblocklist/ALIENVAULT.conf fi if [ -e /var/lib/ipblocklist/SPAMHAUS_EDROP.conf ]; then rm /var/lib/ipblocklist/SPAMHAUS_EDROP.conf fi + if [ -e /var/lib/ipblocklist/ABUSECH_BOTNETC2.conf ]; then + rm /var/lib/ipblocklist/ABUSECH_BOTNETC2.conf + fi =20 # The collectd directory structure was changed but not all changes # are done by the official migration script generator --=20 2.48.1 --===============7421767204186911189==--