X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=9e900bec118e2f7cd8b866e225c0b5704c01fa3c;hb=f61e5e2b2e805de633c0f6e4b7eb0161d928cfc8;hp=8ffe495de3deeeaa7fdad2ebb4e1f963c85bff53;hpb=a832220b134218ea09f160f7ad11c7a502233c65;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 8ffe495de..9e900bec1 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -57,7 +57,7 @@ class ssl {
 		purge    => true,
 		recurse  => true,
 		force    => true,
-		notify   => Exec['refresh_normal_hashes'],
+		notify   => [ Exec['refresh_normal_hashes'], Exec['refresh_ca_global_hashes'] ],
 	}
 	file { '/etc/ssl/certs/README':
 		ensure => absent,
@@ -108,15 +108,16 @@ class ssl {
 		notify  => Exec['refresh_debian_hashes'],
 	}
 
-	#file { '/etc/ssl/debian/keys/thishost.key':
-	#	ensure => absent,
-	#}
-	#file { '/etc/ssl/debian/keys/thishost-server.key':
-	#	ensure => absent,
-	#}
-	#file { '/etc/ssl/debian/keys':
-	#	ensure => absent,
-	#}
+	file { '/etc/ssl/debian/keys/thishost.key':
+		ensure => absent,
+	}
+	file { '/etc/ssl/debian/keys/thishost-server.key':
+		ensure => absent,
+	}
+	file { '/etc/ssl/debian/keys':
+		ensure => absent,
+		force    => true,
+	}
 	file { '/etc/ssl/private/thishost.key':
 		source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
 		mode    => '0440',