summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-25 17:16:34 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-25 17:16:34 -0200
commit60c06a1aac39892ae444f18903e09cf1b7b05131 (patch)
treed16a9038b9deb226ef5b48f599863bc8d05e6c19 /manifests
parent8698c5ed49fb49b93171f9d7bca3004addf4bbfb (diff)
downloadpuppet-exim-60c06a1aac39892ae444f18903e09cf1b7b05131.tar.gz
puppet-exim-60c06a1aac39892ae444f18903e09cf1b7b05131.tar.bz2
Updating module for 2.7 compatibility
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 433808a..d0e39ff 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -27,7 +27,7 @@ class exim {
}
file { "/etc/aliases":
- source => [ "puppet:///modules/site_mail/$domain/aliases",
+ source => [ "puppet:///modules/site_mail/${::domain}/aliases",
"puppet:///modules/site_mail/aliases" ],
owner => "root",
group => "root",
@@ -96,6 +96,8 @@ class exim::tls inherits exim {
notify => Service["exim4"],
}
+ $exim_tls_verify_relay_to_domains = hiera('exim::tls_verify_relay_to_domains', '')
+
file { '/etc/exim4/conf.d/main/00_local_settings':
ensure => $exim_tls_verify_relay_to_domains ? {
'' => absent,