X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=4a629fbd4e6a72619afe0995c07f1ff3748eaa8e;hb=2c913053fee480323b0801cefff685af2dbe1bf7;hp=5aedfbc9f382d9c80d9d9238adf71bd1f20983a9;hpb=d4fb891a1a7d58fdeff2687e91f5e6faf822a96c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 5aedfbc9f..4a629fbd4 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -11,12 +11,20 @@ class ssl {
 		ensure   => installed,
 	}
 
+	if $::hostname == 'godard' {
+		$extra_ssl_certs_flags = ' --default'
+		$ssl_certs_config = 'puppet:///modules/ssl/ca-certificates-global.conf'
+	} else {
+		$extra_ssl_certs_flags = ''
+		$ssl_certs_config = 'puppet:///modules/ssl/ca-certificates.conf'
+	}
+
 	file { '/etc/ssl/README':
 		mode   => '0444',
 		source => 'puppet:///modules/ssl/README',
 	}
 	file { '/etc/ca-certificates.conf':
-		source => 'puppet:///modules/ssl/ca-certificates.conf',
+		source => $ssl_certs_config,
 		notify  => Exec['refresh_normal_hashes'],
 	}
 	file { '/etc/ca-certificates-debian.conf':
@@ -57,7 +65,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,
@@ -92,22 +100,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'],
@@ -119,16 +115,42 @@ 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,
 		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':
@@ -142,34 +164,35 @@ class ssl {
 		refreshonly => true,
 		require     => Package['openssl'],
 	}
+
 	exec { 'refresh_normal_hashes':
 		# NOTE 1: always use update-ca-certificates to manage hashes in
 		#         /etc/ssl/certs otherwise /etc/ssl/ca-certificates.crt will
 		#         get a hash overriding the hash that would have been generated
 		#         for another certificate ... which is problem, comrade
 		# NOTE 2: always ask update-ca-certificates to freshen (-f) the links
-		command     => '/usr/sbin/update-ca-certificates -f',
+		command     => "/usr/sbin/update-ca-certificates --fresh${extra_ssl_certs_flags}",
 		refreshonly => true,
 		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],
 		]
 	}