X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=b6cb8290592f5eaaf2e5229d4d69d1fad7bc13d3;hb=ad144c20d54eb33597becebd0734d64e7b2fdea6;hp=8b47024134340625cef93003cd6049123f9ebbbf;hpb=a1e5d966dc866d7d3298cd3538ad583328a11991;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 8b4702413..b6cb82905 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -41,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,
@@ -109,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',
 	}