From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 30 Apr 2009 19:57:30 +0000 (+0200)
Subject: Break all our mail relaying stuff because weasel gratuitously renames defines
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=41646d2a8036f0b2e5587256fa39182d1fcfb218;hp=e44f88ebe653399eeaff5e1188c8bd85d6445876;p=mirror%2Fdsa-puppet.git

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 696901d17..b914bafb5 100644
--- 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 9a070dd1e..6ea5b7e5b 100644
--- 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 1e2079258..5ca41aa1d 100644
--- 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 d160da521..018dc678c 100644
--- 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 9a070dd1e..6ea5b7e5b 100644
--- 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