From: Adolf Belka <adolf.belka@ipfire.org>
Date: Fri, 19 Apr 2024 13:39:41 +0000 (+0200)
Subject: backup.pl: removes any references to ALIENVAULT & SPAMHAUSEDROP from restores
X-Git-Tag: v2.29-core186~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fdaa9577b45487dd13df467d09817beafc1e1f1;p=ipfire-2.x.git

backup.pl: removes any references to ALIENVAULT & SPAMHAUSEDROP from restores

- This patch ensures that if a restore is carried out from an earlier version that includes
   ALIENVAULT and/or SPAMHAUS_EDROP that the references will be removed.
- This is the same code as was put into the update.sh file with the previous patch of this
   set.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index b434207400..d848084e94 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -193,7 +193,7 @@ restore_backup() {
 
 	# Update OpenVPN CRL
 	/etc/fcron.daily/openvpn-crl-updater
-	
+
 	# Update OpenVPN N2N Client Configs
 	## Add providers legacy default line to n2n client config files
 	# Check if ovpnconfig exists and is not empty
@@ -246,6 +246,17 @@ restore_backup() {
 			-signkey /etc/httpd/server.key \
 			-out /etc/httpd/server.crt &>/dev/null
 	fi
+
+	# Remove any entry for ALIENVAULT or SPAMHAUS_EDROP from the ipblocklist modified file
+	# and the associated ipblocklist files from the /var/lib/ipblocklist directory
+	sed -i '/ALIENVAULT=/d' /var/ipfire/ipblocklist/modified
+	sed -i '/SPAMHAUS_EDROP=/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
 	return 0
 }