Move firewall definition

Signed-off-by: Stephen Gran <steve@lobefin.net>

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 b1228f89da2a3a8efaa0860f508d13b8e9928065..94fc5f60b325ab41965913b7ccad03808229a684 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
@@ -3,6 +3,6 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-STUPID_FIREWALL = 1
 SMARTHOST = spohr.debian.org
 SMARTHOST_PORT = 587
+STUPID_FIREWALL = 1

diff --git a/templates/exim-local-auto.erb b/templates/exim-local-auto.erb
index fa0f4c92af57b4e486f9c243867d2b57d2ea132d..0412dcd0761b3fe35595bbb967a667b244c0d8be 100644 (file)
--- a/templates/exim-local-auto.erb
+++ b/templates/exim-local-auto.erb
@@ -47,10 +47,3 @@ USE_TLS = 1
 # USE_TLS is undefined
 <% end -%>
 
-# Firewall stuff
-<% if has_variable?("fqdn") && fqdn == "lafayette.debian.org" -%>
-STUPID_FIREWALL = 1
-<% else -%>
-# STUPID_FIREWALL is undefined
-<% end -%>
-