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

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 17d028509..9e900bec1 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -11,6 +11,10 @@ class ssl {
 		ensure   => installed,
 	}
 
+	file { '/etc/ssl/README':
+		mode   => '0444',
+		source => 'puppet:///modules/ssl/README',
+	}
 	file { '/etc/ca-certificates.conf':
 		source => 'puppet:///modules/ssl/ca-certificates.conf',
 		notify  => Exec['refresh_normal_hashes'],
@@ -53,27 +57,24 @@ 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':
-		mode   => '0444',
-		source => 'puppet:///modules/ssl/README.certs',
+		ensure => absent,
 	}
 	file { '/etc/ssl/ca-debian':
 		ensure => directory,
 		mode   => '0755',
 	}
 	file { '/etc/ssl/ca-debian/README':
-		mode   => '0444',
-		source => 'puppet:///modules/ssl/README.ca-debian',
+		ensure => absent,
 	}
 	file { '/etc/ssl/ca-global':
 		ensure => directory,
 		mode   => '0755',
 	}
 	file { '/etc/ssl/ca-global/README':
-		mode   => '0444',
-		source => 'puppet:///modules/ssl/README.ca-global',
+		ensure => absent,
 	}
 	file { '/etc/ssl/debian':
 		ensure   => directory,
@@ -91,22 +92,10 @@ class ssl {
 		ensure  => directory,
 		mode    => '0755',
 	}
-	file { '/etc/ssl/debian/keys':
-		ensure  => directory,
-		mode    => '0750',
-		group   => ssl-cert,
-		require => Package['ssl-cert'],
-	}
 	file { '/etc/ssl/debian/certs/thishost.crt':
 		source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.client.crt",
 		notify  => Exec['refresh_debian_hashes'],
 	}
-	file { '/etc/ssl/debian/keys/thishost.key':
-		source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
-		mode    => '0440',
-		group   => ssl-cert,
-		require => Package['ssl-cert'],
-	}
 	file { '/etc/ssl/debian/certs/ca.crt':
 		source  => 'puppet:///modules/ssl/clientcerts/ca.crt',
 		notify  => Exec['refresh_debian_hashes'],
@@ -118,7 +107,24 @@ class ssl {
 		source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
 		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,
+		force    => true,
+	}
+	file { '/etc/ssl/private/thishost.key':
+		source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
+		mode    => '0440',
+		group   => ssl-cert,
+		require => Package['ssl-cert'],
+	}
+	file { '/etc/ssl/private/thishost-server.key':
 		source  => "puppet:///modules/exim/certs/${::fqdn}.key",
 		mode    => '0440',
 		group   => ssl-cert,