Merge branch 'next' of ssh://people.ipfire.org/pub/git/ipfire-2.x into next

[people/mfischer/ipfire-2.x.git] / config / rootfiles / core / 186 / update.sh

diff --git a/config/rootfiles/core/186/update.sh b/config/rootfiles/core/186/update.sh
index 444b041a4960e97d6128e86c518fbc08d7796f7f..5d7add89f95fd542123de6964567558718697731 100644 (file)
--- a/config/rootfiles/core/186/update.sh
+++ b/config/rootfiles/core/186/update.sh
@@ -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...