diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 17:16:34 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 17:16:34 -0200 |
| commit | 60c06a1aac39892ae444f18903e09cf1b7b05131 (patch) | |
| tree | d16a9038b9deb226ef5b48f599863bc8d05e6c19 | |
| parent | 8698c5ed49fb49b93171f9d7bca3004addf4bbfb (diff) | |
| download | puppet-exim-60c06a1aac39892ae444f18903e09cf1b7b05131.tar.gz puppet-exim-60c06a1aac39892ae444f18903e09cf1b7b05131.tar.bz2 | |
Updating module for 2.7 compatibility
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | templates/update-exim4.conf.conf.erb | 2 |
2 files changed, 4 insertions, 2 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, diff --git a/templates/update-exim4.conf.conf.erb b/templates/update-exim4.conf.conf.erb index db4be67..e25ec1f 100644 --- a/templates/update-exim4.conf.conf.erb +++ b/templates/update-exim4.conf.conf.erb @@ -12,7 +12,7 @@ # Debconf configuration, but not all of them. # dc_eximconfig_configtype='internet' -dc_other_hostnames='<%= fqdn %>' +dc_other_hostnames='<%= scope.lookupvar('::fqdn') %>' dc_local_interfaces='127.0.0.1' dc_readhost='' dc_relay_domains='' |