X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=b6cb8290592f5eaaf2e5229d4d69d1fad7bc13d3;hb=225f9f1650b942977fc3e9f5a2e3826108d2b43f;hp=49504e05e7c204e7335fcb499f29560031d462a0;hpb=2df9a9bac3e0c1ca36aa0d427056196c0cbe1d92;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 49504e05e..b6cb82905 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,7 +1,6 @@
 class exim {
 
 	$is_mailrelay = has_role('mailrelay')
-	$is_bugsmaster = has_role('bugsmaster')
 	$is_bugsmx = has_role('bugsmx')
 	$is_rtmaster = has_role('rtmaster')
 	$is_packagesmaster = has_role('packagesmaster')
@@ -42,10 +41,6 @@ class exim {
 		require => Package['exim4-daemon-heavy'],
 		purge   => true,
 	}
-	file { '/etc/exim4/Git':
-		ensure  => absent,
-		force   => true,
-	}
 	file { '/etc/exim4/conf.d':
 		ensure  => directory,
 		purge   => true,
@@ -110,22 +105,22 @@ class exim {
 		source => 'puppet:///modules/exim/common/logrotate-exim4-paniclog'
 	}
 	file { '/etc/exim4/ssl/thishost.crt':
-		source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".crt") %>'),
 		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/thishost.key':
-		source  => "puppet:///modules/exim/certs/${::fqdn}.key",
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".key") %>'),
 		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/ca.crt':
-		source  => 'puppet:///modules/exim/certs/ca.crt',
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/ca.crt") %>'),
 		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/ca.crl':
-		source  => 'puppet:///modules/exim/certs/ca.crl',
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/ca.crl") %>'),
 		group   => 'Debian-exim',
 		mode    => '0640',
 	}