Updating module for 2.7 compatibility

diff --git a/manifests/init.pp b/manifests/init.pp
index 433808a26ab193dc4a3ffb832554c84484fd2e44..d0e39ff7c544bb4d32ab9b81bfe84b68cc4e1d09 100644 (file)
--- 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 db4be678d2bf00803244fc5fa0a9af5afe12ac52..e25ec1f21b004c8d3434b3b5bc781bfac43c5b34 100644 (file)
--- 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=''