From f7ecbeb03c09fa5ad5e58ae977b7ba3a63581bdd Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 21 Sep 2016 07:05:40 -0700 Subject: [PATCH] Template local_domains Change-Id: Ie6ac9e87b69b93b6e121dad8ceae5fde7931877a --- manifests/init.pp | 1 + templates/exim4.conf.erb | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 5f2ba33..a3838eb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -21,6 +21,7 @@ # http://www.exim.org/exim-html-current/doc/html/spec_html/index.html class exim( + $local_domains = '@', $mailman_domains = [], $queue_interval = '30m', $queue_run_max = '5', diff --git a/templates/exim4.conf.erb b/templates/exim4.conf.erb index 57f5db1..21e1c40 100644 --- a/templates/exim4.conf.erb +++ b/templates/exim4.conf.erb @@ -56,8 +56,7 @@ CONFDIR = <%= scope.lookupvar('exim::params::conf_dir') %> # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They # are all colon-separated lists: -domainlist local_domains = @<% if @mailman_domains.length > 0 -%>:<%= @mailman_domains.join(":") %><% end -%> - +domainlist local_domains = <%= @local_domains %><% if @mailman_domains.length > 0 -%>:<%= @mailman_domains.join(":") %><% end -%> domainlist relay_to_domains = hostlist relay_from_hosts = 127.0.0.1