From: Stephen Gran Date: Mon, 6 Apr 2009 00:11:45 +0000 (+0100) Subject: Short test - this is the wrong way to do it, but lets see if the idea X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a21d93fcd795b1b7b63d5dc867befc09e368d44b;p=mirror%2Fdsa-puppet.git Short test - this is the wrong way to do it, but lets see if the idea works Signed-off-by: Stephen Gran --- diff --git a/modules/exim/files/common/exim4.conf b/modules/exim/files/common/exim4.conf index cecdcf50a..93802745a 100644 --- a/modules/exim/files/common/exim4.conf +++ b/modules/exim/files/common/exim4.conf @@ -197,7 +197,7 @@ queue_list_requires_admin = false av_scanner = CLAMAV .endif -.ifdef HAVE_USER_DEBBUGS MAIL_RELAY +.ifdef HAVE_USER_DEBBUGS MAIL_RELAY STUPID_FIREWALL daemon_smtp_ports = 25 : 587 .endif diff --git a/templates/exim-local-auto.erb b/templates/exim-local-auto.erb index 349d6ed3e..fa0f4c92a 100644 --- a/templates/exim-local-auto.erb +++ b/templates/exim-local-auto.erb @@ -46,3 +46,11 @@ USE_TLS = 1 <% else -%> # USE_TLS is undefined <% end -%> + +# Firewall stuff +<% if has_variable?("fqdn") && fqdn == "lafayette.debian.org" -%> +STUPID_FIREWALL = 1 +<% else -%> +# STUPID_FIREWALL is undefined +<% end -%> +