From 039dc4a561bc803c966094b6fd1720414c9a7dfa Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Thu, 27 Feb 2025 22:51:44 +0100
Subject: [PATCH] SpamHaus DNSBL removed from exim4

---
 Changelog.md                      | 5 +++++
 install/debian/10/exim/dnsbl.conf | 1 -
 install/debian/11/exim/dnsbl.conf | 1 -
 install/debian/12/exim/dnsbl.conf | 1 -
 install/debian/8/exim/dnsbl.conf  | 1 -
 install/debian/9/exim/dnsbl.conf  | 1 -
 install/vst-install-debian.sh     | 1 +
 src/deb/latest.txt                | 2 +-
 src/deb/vesta/postinst            | 6 ++++++
 9 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7d22747a..36478469 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+Version 0.9.9-0-12 [28-Feb-2025]
+==================================================
+* SpamHaus DNSBL removed from exim4
+* A lot of small bugs fixed
+
 Version 0.9.9-0-11 [30-May-2024]
 ==================================================
 * Introducing v-run-wp-cli command ( @isscbta )
diff --git a/install/debian/10/exim/dnsbl.conf b/install/debian/10/exim/dnsbl.conf
index 5166b255..279bafcd 100644
--- a/install/debian/10/exim/dnsbl.conf
+++ b/install/debian/10/exim/dnsbl.conf
@@ -1,2 +1 @@
 bl.spamcop.net
-zen.spamhaus.org
diff --git a/install/debian/11/exim/dnsbl.conf b/install/debian/11/exim/dnsbl.conf
index 5166b255..279bafcd 100644
--- a/install/debian/11/exim/dnsbl.conf
+++ b/install/debian/11/exim/dnsbl.conf
@@ -1,2 +1 @@
 bl.spamcop.net
-zen.spamhaus.org
diff --git a/install/debian/12/exim/dnsbl.conf b/install/debian/12/exim/dnsbl.conf
index 5166b255..279bafcd 100644
--- a/install/debian/12/exim/dnsbl.conf
+++ b/install/debian/12/exim/dnsbl.conf
@@ -1,2 +1 @@
 bl.spamcop.net
-zen.spamhaus.org
diff --git a/install/debian/8/exim/dnsbl.conf b/install/debian/8/exim/dnsbl.conf
index 5166b255..279bafcd 100644
--- a/install/debian/8/exim/dnsbl.conf
+++ b/install/debian/8/exim/dnsbl.conf
@@ -1,2 +1 @@
 bl.spamcop.net
-zen.spamhaus.org
diff --git a/install/debian/9/exim/dnsbl.conf b/install/debian/9/exim/dnsbl.conf
index 5166b255..279bafcd 100644
--- a/install/debian/9/exim/dnsbl.conf
+++ b/install/debian/9/exim/dnsbl.conf
@@ -1,2 +1 @@
 bl.spamcop.net
-zen.spamhaus.org
diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index 47153ade..850b91f7 100755
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -2037,6 +2037,7 @@ touch /usr/local/vesta/data/upgrades/enable_cookie_httponly
 touch /usr/local/vesta/data/upgrades/fix_exim_494_autoreply
 touch /usr/local/vesta/data/upgrades/freshclam_start
 touch /usr/local/vesta/data/upgrades/barracuda_rbl
+touch /usr/local/vesta/data/upgrades/spamhaus_dnsbl_removed
 
 # Secret URL
 secretquery=''
diff --git a/src/deb/latest.txt b/src/deb/latest.txt
index 4b6e56b5..c1732bff 100644
--- a/src/deb/latest.txt
+++ b/src/deb/latest.txt
@@ -1 +1 @@
-vesta-0.9.9-0-11
\ No newline at end of file
+vesta-0.9.9-0-12
\ No newline at end of file
diff --git a/src/deb/vesta/postinst b/src/deb/vesta/postinst
index 4d414655..9f8ee3e8 100755
--- a/src/deb/vesta/postinst
+++ b/src/deb/vesta/postinst
@@ -25,6 +25,12 @@ fi
 echo "1" > /usr/local/vesta/data/upgrades/show_changelog
 chmod a=rw /usr/local/vesta/data/upgrades/show_changelog
 
+# Removing SpamHaus DNSBL
+if [ ! -f "/usr/local/vesta/data/upgrades/spamhaus_dnsbl_removed" ]; then
+    sed -i '/zen.spamhaus.org/d' /etc/exim4/dnsbl.conf
+    touch /usr/local/vesta/data/upgrades/spamhaus_dnsbl_removed
+fi
+
 # Fixing 'dh key too small' in dovecot
 if [ -f "/var/log/dovecot.log.1" ] && [ -f "/etc/dovecot/conf.d/10-ssl.conf" ] && [ -f "/usr/share/dovecot/dh.pem" ]; then
     if grep -q 'dh key too small' /var/log/dovecot.log.1; then