From 1b1278ddfc910989bbb70f31725363f46c8f606d Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 8 Oct 2013 22:08:13 +0000 Subject: [PATCH] Revert "Make gerrit email server configurable" This reverts commit 040073e7463a661340aea83da744fe5ebeb40d1f --- manifests/init.pp | 1 - templates/exim4.conf.erb | 9 --------- 2 files changed, 10 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 86bd189..4781715 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -3,7 +3,6 @@ class exim( $queue_interval = '30m', $queue_run_max = '5', $queue_smtp_domains = '', - $smarthost = '', $sysadmin = [] ) { diff --git a/templates/exim4.conf.erb b/templates/exim4.conf.erb index e3b424c..7fb1ff0 100644 --- a/templates/exim4.conf.erb +++ b/templates/exim4.conf.erb @@ -606,21 +606,12 @@ 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.