From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 7 Mar 2016 20:56:32 +0000 (+0100)
Subject: And clean out /etc/ssl/debian/keys
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=7ff5833d3a9b8357a66e49dab6e777ed0af6cebf;p=mirror%2Fdsa-puppet.git

And clean out /etc/ssl/debian/keys
---

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 8ffe495de..37423a966 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -108,15 +108,15 @@ 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,
+	}
 	file { '/etc/ssl/private/thishost.key':
 		source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
 		mode    => '0440',