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

update.sh: Add SPAMHAUS_DROP if SPAMHAUS_EDROP was previously used

Browse Source 
- I realised that the previous patch for update.sh related to the ipblocklist removal
   of ALIENVAULT and SPAMHAUS_EDROP only removed the SPAMHAUS_EDROP setting. It makes sense
   to add SPAMHAUS_DROP to the settings file if SPAMHAUS_EDROP was previously used and
   SPAMHAUS_DROP was not selected.
- This patch adds the above change.

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-05-04 15:05:20 +02:00
committed by Arne Fitzenreiter
parent 0bb5687fb7
commit 7cb0220f4a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/rootfiles/core/186/update.sh
View File

@@ -141,6 +141,7 @@ 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
# If SPAMHAUS_EDROP was used and SPAMHAUS_DROP not used then add SPAMHAUS_DROP to settings file
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
@@ -148,6 +149,9 @@ if [ -e /var/lib/ipblocklist/ALIENVAULT.conf ]; then
fi
if [ -e /var/lib/ipblocklist/SPAMHAUS_EDROP.conf ]; then
rm /var/lib/ipblocklist/SPAMHAUS_EDROP.conf
if [ ! -e /var/lib/ipblocklist/SPAMHAUS_DROP.conf ]; then
echo "SPAMHAUS_DROP=on" >> /var/ipfire/ipblocklist/settings
fi
fi
# This update needs a reboot...