X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=a63f8f7c07731d842e031f011475ac2bd252e817;hb=2064fb719c37fed1ae8ddaa175bec7964dac432b;hp=612fcc9269256f36ab1d5c60189b5391b75edbf5;hpb=e33609ec26fd4a964e150da0a3e4b3ec47ca1f31;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 612fcc926..a63f8f7c0 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -101,18 +101,18 @@ class ssl {
 		mode    => '0755',
 	}
 	file { '/etc/ssl/debian/certs/thishost.crt':
-		source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.client.crt",
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_clientcerts_dir"]) + "/" + @fqdn + ".client.crt") %>'),
 		notify  => Exec['refresh_debian_hashes'],
 	}
 	file { '/etc/ssl/debian/certs/ca.crt':
-		source  => 'puppet:///modules/ssl/clientcerts/ca.crt',
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_clientcerts_dir"]) + "/ca.crt") %>'),
 		notify  => Exec['refresh_debian_hashes'],
 	}
 	file { '/etc/ssl/debian/crls/ca.crl':
-		source  => 'puppet:///modules/ssl/clientcerts/ca.crl',
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_clientcerts_dir"]) + "/ca.crl") %>'),
 	}
 	file { '/etc/ssl/debian/certs/thishost-server.crt':
-		source  => "puppet:///modules/ssl/auto-certs/${::fqdn}.crt",
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".crt") %>'),
 		notify  => Exec['refresh_debian_hashes'],
 	}
 
@@ -127,13 +127,13 @@ class ssl {
 		force    => true,
 	}
 	file { '/etc/ssl/private/thishost.key':
-		source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_clientcerts_dir"]) + "/" + @fqdn + ".key") %>'),
 		mode    => '0440',
 		group   => ssl-cert,
 		require => Package['ssl-cert'],
 	}
 	file { '/etc/ssl/private/thishost-server.key':
-		source  => "puppet:///modules/ssl/auto-certs/${::fqdn}.key",
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".key") %>'),
 		mode    => '0440',
 		group   => ssl-cert,
 		require => Package['ssl-cert'],