X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=caf74805573a0d0f9ecd38dc171df1aed09aace1;hb=bd35714fff1db0ae3901ea95e82a8f603130bcae;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..caf748055 100644 --- a/modules/exim/manifests/init.pp +++ b/modules/exim/manifests/init.pp @@ -109,22 +109,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', }