webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 12:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- 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>
This commit is contained in:
Adolf Belka
2024-04-19 15:39:41 +02:00
committed by Arne Fitzenreiter
parent 6408ff8d6a
commit 4fdaa9577b
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/backup/backup.pl
View File

@@ -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
}