]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Short test - this is the wrong way to do it, but lets see if the idea
authorStephen Gran <steve@lobefin.net>
Mon, 6 Apr 2009 00:11:45 +0000 (01:11 +0100)
committerStephen Gran <steve@lobefin.net>
Mon, 6 Apr 2009 00:11:45 +0000 (01:11 +0100)
works
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/exim/files/common/exim4.conf
templates/exim-local-auto.erb

index cecdcf50afa86052901bf2feb4f8bbe5802ba871..93802745adeb21a5f40868fc185e1830352411b3 100644 (file)
@@ -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
 
index 349d6ed3e2ae73254811a3fe1751799d111d95a3..fa0f4c92af57b4e486f9c243867d2b57d2ea132d 100644 (file)
@@ -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 -%>
+