From 14a2f2c628bcd3376f8fde206f03afd8eadadd2d Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Tue, 7 Apr 2009 21:35:01 +0100 Subject: [PATCH] Move firewall definition Signed-off-by: Stephen Gran --- .../per-host/lafayette.debian.org/local-settings.conf | 2 +- templates/exim-local-auto.erb | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) 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 b1228f89d..94fc5f60b 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 @@ -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 fa0f4c92a..0412dcd07 100644 --- 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 -%> - -- 2.20.1