X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fstunnel4%2Fmanifests%2Fclient.pp;h=e34cb10e93b500a88f56f1d65bbf4606d83f136f;hb=7d26559131d4900e63edae21954e5604ae1ff8d4;hp=eb7dac7b2586d5c6da47f43e890691af8adcab93;hpb=8e51e4546e1d676138eb65e50de58c306cfd878a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/stunnel4/manifests/client.pp b/modules/stunnel4/manifests/client.pp
index eb7dac7b2..e34cb10e9 100644
--- a/modules/stunnel4/manifests/client.pp
+++ b/modules/stunnel4/manifests/client.pp
@@ -3,8 +3,11 @@ define stunnel4::client($accept, $connecthost, $connectport) {
 	include stunnel4
 
 	file { "/etc/stunnel/puppet-${name}-peer.pem":
-		content => generate('/bin/cat', "/etc/puppet/modules/exim/files/certs/${connecthost}.crt",
-			'/etc/puppet/modules/exim/files/certs/ca.crt'),
+		content => inline_template( @("EOF"),
+						<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @connecthost + ".crt") %>
+						<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/ca.crt") %>
+						| EOF
+					),
 		notify  => Exec["restart_stunnel_${name}"],
 	}