From 0e2b4654aa0cbc51ebb1795909ebaa80a9352565 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 8 Oct 2013 22:11:32 +0000 Subject: [PATCH] Un-Revert "Make gerrit email server configurable" This time, make the default value false instead of empty string. This reverts commit 99d3283dc246da4b4d2d26ecfb193b308881f05d Change-Id: I88108ff75f1c2bd3aa78856c186312340258ec3c --- manifests/init.pp | 1 + templates/exim4.conf.erb | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 4781715..b641dda 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -3,6 +3,7 @@ class exim( $queue_interval = '30m', $queue_run_max = '5', $queue_smtp_domains = '', + $smarthost = false, $sysadmin = [] ) { diff --git a/templates/exim4.conf.erb b/templates/exim4.conf.erb index 7fb1ff0..e3b424c 100644 --- a/templates/exim4.conf.erb +++ b/templates/exim4.conf.erb @@ -606,12 +606,21 @@ mailman_router: # If the DNS lookup fails, no further routers are tried because of the no_more # setting, and consequently the address is unrouteable. +<% if smarthost -%> +smarthost: + driver = manualroute + domains = !+local_domains + transport = remote_smtp + route_list = * <%= smarthost %> + no_more +<% else -%> dnslookup: driver = dnslookup domains = ! +local_domains transport = remote_smtp ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8 no_more +<% end -%> # The remaining routers handle addresses in the local domain(s), that is those # domains that are defined by "domainlist local_domains" above.