Break all our mail relaying stuff because weasel gratuitously renames defines

diff --git a/modules/exim/files/common/exim4.conf b/modules/exim/files/common/exim4.conf
index 696901d..b914baf 100644 (file)
--- a/modules/exim/files/common/exim4.conf
+++ b/modules/exim/files/common/exim4.conf
@@ -197,10 +197,10 @@ queue_list_requires_admin = false
 av_scanner = CLAMAV
 .endif
 
-.ifdef HAVE_USER_DEBBUGS MAIL_RELAY STUPID_FIREWALL
+.ifdef HAVE_USER_DEBBUGS MAIL_RELAY MAIL_IN_VIA_SUBMISSION
 daemon_smtp_ports = 25 : 587
 .else
-.ifdef EVEN_MORE_STUPID_FIREWALL
+.ifdef MAIL_IN_VIA_2025
 daemon_smtp_ports = 25 : 2025
 .endif
 .endif

diff --git a/modules/exim/files/per-host/ancina.debian.org/local-settings.conf b/modules/exim/files/per-host/ancina.debian.org/local-settings.conf
index 9a070dd..6ea5b7e 100644 (file)
--- a/modules/exim/files/per-host/ancina.debian.org/local-settings.conf
+++ b/modules/exim/files/per-host/ancina.debian.org/local-settings.conf
@@ -5,4 +5,4 @@
 
 SMARTHOST = spohr.debian.org
 SMARTHST_PORT = 587
-EVEN_MORE_STUPID_FIREWALL = 1
+MAIL_IN_VIA_2025 = 1

diff --git a/modules/exim/files/per-host/kassia.debian.org/local-settings.conf b/modules/exim/files/per-host/kassia.debian.org/local-settings.conf
index 1e20792..5ca41aa 100644 (file)
--- a/modules/exim/files/per-host/kassia.debian.org/local-settings.conf
+++ b/modules/exim/files/per-host/kassia.debian.org/local-settings.conf
@@ -3,4 +3,4 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-STUPID_FIREWALL = 1
+MAIL_IN_VIA_SUBMISSION = 1

diff --git a/modules/exim/files/per-host/lafayette.debian.org/local-settings.conf b/modules/exim/files/per-host/lafayette.debian.org/local-settings.conf
index d160da5..018dc67 100644 (file)
--- a/modules/exim/files/per-host/lafayette.debian.org/local-settings.conf
+++ b/modules/exim/files/per-host/lafayette.debian.org/local-settings.conf
@@ -5,4 +5,4 @@
 
 SMARTHOST = spohr.debian.org
 SMARTHST_PORT = 587
-STUPID_FIREWALL = 1
+MAIL_IN_VIA_SUBMISSION = 1

diff --git a/modules/exim/files/per-host/piatti.debian.org/local-settings.conf b/modules/exim/files/per-host/piatti.debian.org/local-settings.conf
index 9a070dd..6ea5b7e 100644 (file)
--- a/modules/exim/files/per-host/piatti.debian.org/local-settings.conf
+++ b/modules/exim/files/per-host/piatti.debian.org/local-settings.conf
@@ -5,4 +5,4 @@
 
 SMARTHOST = spohr.debian.org
 SMARTHST_PORT = 587
-EVEN_MORE_STUPID_FIREWALL = 1
+MAIL_IN_VIA_2025 = 1