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 696901d17b133cd6ce304d9046c77c734d2eedd9..b914bafb5ec83d07c90c28d5092bb205d5f91333 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 9a070dd1e633c4fc77a29041b54c7757c905d9c7..6ea5b7e5b3d3806849965acede2ae0359e1e4a13 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 1e2079258247ddaf367d15c3d9ccf904f2fe7979..5ca41aa1d9b83d8100756be276885a0f499547ee 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 d160da52174d8cf4818dab4331cb96591e4e61ae..018dc678c19fd80d5a09537af8ee1c329943c26c 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 9a070dd1e633c4fc77a29041b54c7757c905d9c7..6ea5b7e5b3d3806849965acede2ae0359e1e4a13 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