X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=636d2b567bdef2a1239959125d459c36c4e2dc19;hb=d325df56af008cc979ef463ba8eb1f69e74ff6af;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..636d2b567 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',
@@ -130,9 +131,18 @@ class ssl {
 		require => Package['ssl-cert'],
 	}
 
-	file { '/usr/local/sbin/update-ca-certificates-dsa':
-		mode   => '0555',
-		source => 'puppet:///modules/ssl/update-ca-certificates-dsa',
+	$updatecacertsdsa = '/usr/local/sbin/update-ca-certificates-dsa'
+	if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
+		file { $updatecacertsdsa:
+			ensure => absent,
+		}
+		$updatecacerts = '/usr/sbin/update-ca-certificates'
+	} else {
+		file { $updatecacertsdsa:
+			mode   => '0555',
+			source => 'puppet:///modules/ssl/update-ca-certificates-dsa',
+		}
+		$updatecacerts = $updatecacertsdsa
 	}
 
 	exec { 'retire_debian_links':
@@ -157,23 +167,23 @@ class ssl {
 		require     => Package['ca-certificates'],
 	}
 	exec { 'refresh_ca_debian_hashes':
-		command     => '/usr/local/sbin/update-ca-certificates-dsa --fresh --certsconf /etc/ca-certificates-debian.conf --localcertsdir /dev/null --etccertsdir /etc/ssl/ca-debian --hooksdir /dev/null',
+		command     => "${updatecacerts} --fresh --certsconf /etc/ca-certificates-debian.conf --localcertsdir /dev/null --etccertsdir /etc/ssl/ca-debian --hooksdir /dev/null",
 		refreshonly => true,
 		require     => [
 			Package['ca-certificates'],
 			File['/etc/ssl/ca-debian'],
 			File['/etc/ca-certificates-debian.conf'],
-			File['/usr/local/sbin/update-ca-certificates-dsa'],
+			File[$updatecacertsdsa],
 		]
 	}
 	exec { 'refresh_ca_global_hashes':
-		command     => '/usr/local/sbin/update-ca-certificates-dsa --fresh --default --certsconf /etc/ca-certificates-global.conf --etccertsdir /etc/ssl/ca-global --hooksdir /dev/null',
+		command     => "${updatecacerts} --fresh --default --certsconf /etc/ca-certificates-global.conf --etccertsdir /etc/ssl/ca-global --hooksdir /dev/null",
 		refreshonly => true,
 		require     => [
 			Package['ca-certificates'],
 			File['/etc/ssl/ca-global'],
 			File['/etc/ca-certificates-global.conf'],
-			File['/usr/local/sbin/update-ca-certificates-dsa'],
+			File[$updatecacertsdsa],
 		]
 	}