X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fstunnel4%2Fmanifests%2Fclient.pp;h=e34cb10e93b500a88f56f1d65bbf4606d83f136f;hb=3324b4ae702172197fe7ad725a36f052f1e67c71;hp=43921b02698a23fc577a6aef9f3e26e7dee3d0fd;hpb=400504f0cc41ed8293aa423e09fd01534a0e089b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/stunnel4/manifests/client.pp b/modules/stunnel4/manifests/client.pp
index 43921b026..e34cb10e9 100644
--- a/modules/stunnel4/manifests/client.pp
+++ b/modules/stunnel4/manifests/client.pp
@@ -3,12 +3,15 @@ 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}"],
 	}
 
-	stunnel::generic { $name:
+	stunnel4::generic { $name:
 		client  => true,
 		verify  => 3,
 		cafile  => "/etc/stunnel/puppet-${name}-peer.pem",