X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=21e51e614d5fa4cab1f2d61464c6288673f72de5;hb=cf928c1ad5a2d7666669a3697c4431c0b0a2fe2c;hp=744cb468af8131aa9f2b4f65f0e9f94665e385d6;hpb=0096f1f5e3d0d98dec43acb5f1699c6a8c4ecd66;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 744cb468a..21e51e614 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,6 +1,4 @@
 class ssl {
-	$caconf = '/etc/ca-certificates.conf'
-
 	package { 'openssl':
 		ensure   => installed,
 	}
@@ -29,7 +27,7 @@ class ssl {
 	}
 	file { '/etc/ca-certificates-debian.conf':
 		mode    => '0444',
-		source => 'puppet:///modules/ssl/ca-certificates-debian.conf',
+		source => 'puppet:///modules/ssl/ca-certificates.conf',
 		notify  => Exec['refresh_ca_debian_hashes'],
 	}
 	file { '/etc/ca-certificates-global.conf':
@@ -39,7 +37,7 @@ class ssl {
 
 	file { '/etc/apt/apt.conf.d/local-ssl-ca-global':
 		mode   => '0444',
-		source => 'puppet:///modules/ssl/local-ssl-ca-global',
+		content => template('ssl/local-ssl-ca-global.erb'),
 	}
 
 	file { '/etc/ssl/certs/ssl-cert-snakeoil.pem':