X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=756661e06be479782aefc6ef80a16f1d50356a22;hb=0e375233af569acc80ddd55b3e0b4d522eabb04c;hp=26c82252cf690d8320a784254505db15c757e266;hpb=3e90e0de0b2ec2f9e1236a1d6609e8221a094045;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 26c82252c..756661e06 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,93 +1,196 @@
 class ssl {
+	$caconf = '/etc/ca-certificates.conf'
 
-	package {
-		'openssl':
-			ensure => installed,
-			;
-		'ssl-cert':
-			ensure => installed,
-			;
+	package { 'openssl':
+		ensure   => installed,
+	}
+	package { 'ssl-cert':
+		ensure   => installed,
+	}
+	package { 'ca-certificates':
+		ensure   => installed,
 	}
 
-	file { '/etc/ssl/servicecerts':
-		ensure  => directory,
-		mode    => '0755',
-		purge   => true,
-		recurse => true,
-		force   => true,
-		source  => 'puppet:///modules/ssl/servicecerts/',
-		notify  => Exec['make_new_service_links']
+	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'],
+	}
+	file { '/etc/ca-certificates-debian.conf':
+		mode    => '0444',
+		source => 'puppet:///modules/ssl/ca-certificates-debian.conf',
+		notify  => Exec['refresh_ca_debian_hashes'],
+	}
+	file { '/etc/ca-certificates-global.conf':
+		source => 'puppet:///modules/ssl/ca-certificates-global.conf',
+		notify  => Exec['refresh_ca_global_hashes'],
 	}
 
-	file { '/etc/ssl/debian':
-		ensure  => directory,
-		mode    => '0755',
-		purge   => true,
-		recurse => true,
-		force   => true,
-		source  => 'puppet:///files/empty/'
+	file { '/etc/apt/apt.conf.d/local-ssl-ca-global':
+		mode   => '0444',
+		source => 'puppet:///modules/ssl/local-ssl-ca-global',
 	}
-	file { '/etc/ssl/debian/certs':
+
+	file { '/etc/ssl/certs/ssl-cert-snakeoil.pem':
+		ensure => absent,
+		notify => Exec['refresh_normal_hashes'],
+	}
+	file { '/etc/ssl/private/ssl-cert-snakeoil.key':
+		ensure => absent,
+	}
+
+	file { '/etc/ssl/servicecerts':
+		ensure   => link,
+		purge    => true,
+		force    => true,
+		target   => '/usr/local/share/ca-certificates/debian.org',
+		notify   => Exec['retire_debian_links'],
+	}
+
+	file { '/usr/local/share/ca-certificates/debian.org':
+		ensure   => directory,
+		source   => 'puppet:///modules/ssl/servicecerts/',
+		mode     => '0644', # this works; otherwise all files are +x
+		purge    => true,
+		recurse  => true,
+		force    => true,
+		notify   => [ Exec['refresh_normal_hashes'], Exec['refresh_ca_global_hashes'] ],
+	}
+	file { '/etc/ssl/certs/README':
+		ensure => absent,
+	}
+	file { '/etc/ssl/ca-debian':
 		ensure => directory,
 		mode   => '0755',
 	}
-	file { '/etc/ssl/debian/crls':
+	file { '/etc/ssl/ca-debian/README':
+		ensure => absent,
+	}
+	file { '/etc/ssl/ca-global':
 		ensure => directory,
 		mode   => '0755',
 	}
-	file { '/etc/ssl/debian/keys':
-		ensure => directory,
-		group  => ssl-cert,
-		mode   => '0750',
-		require => Package['ssl-cert'],
+	file { '/etc/ssl/ca-global/README':
+		ensure => absent,
 	}
-	file { '/etc/ssl/debian/certs/thishost.crt':
-		source => "puppet:///modules/ssl/clientcerts/${::fqdn}.client.crt",
-		notify => Exec['c_rehash /etc/ssl/debian/certs'],
+	file { '/etc/ssl/debian':
+		ensure   => directory,
+		source   => 'puppet:///files/empty/',
+		mode     => '0644', # this works; otherwise all files are +x
+		purge    => true,
+		recurse  => true,
+		force    => true,
 	}
-	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':
+		ensure  => directory,
+		mode    => '0755',
+	}
+	file { '/etc/ssl/debian/crls':
+		ensure  => directory,
+		mode    => '0755',
+	}
+	file { '/etc/ssl/debian/certs/thishost.crt':
+		source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.client.crt",
+		notify  => Exec['refresh_debian_hashes'],
 	}
 	file { '/etc/ssl/debian/certs/ca.crt':
-		source => 'puppet:///modules/ssl/clientcerts/ca.crt',
-		notify => Exec['c_rehash /etc/ssl/debian/certs'],
+		source  => 'puppet:///modules/ssl/clientcerts/ca.crt',
+		notify  => Exec['refresh_debian_hashes'],
 	}
 	file { '/etc/ssl/debian/crls/ca.crl':
 		source  => 'puppet:///modules/ssl/clientcerts/ca.crl',
 	}
-
 	file { '/etc/ssl/debian/certs/thishost-server.crt':
 		source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
-		notify => Exec['c_rehash /etc/ssl/debian/certs'],
+		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'],
 	}
 
-	exec { 'make_new_service_links':
-		command     => 'cp -f --symbolic-link ../servicecerts/* .',
+	$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':
+		command     => 'find -lname "../servicecerts/*" -exec rm {} +',
 		cwd         => '/etc/ssl/certs',
 		refreshonly => true,
-		notify      => Exec['cleanup_dead_links']
+		notify      => Exec['refresh_normal_hashes'],
 	}
-
-	exec { 'cleanup_dead_links':
-		command     => 'find -L /etc/ssl/certs -mindepth 1 -maxdepth 1 -type l -delete',
+	exec { 'refresh_debian_hashes':
+		command     => 'c_rehash /etc/ssl/debian/certs',
 		refreshonly => true,
-		notify      => Exec['c_rehash /etc/ssl/certs']
+		require     => Package['openssl'],
+	}
+	if $::hostname == 'godard' {
+		$extra_ssl_certs_flags = ' --default'
+	} else {
+		$extra_ssl_certs_flags = ''
 	}
 
-	exec { 'c_rehash /etc/ssl/certs':
+	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 --fresh${extra_ssl_certs_flags}",
 		refreshonly => true,
+		require     => Package['ca-certificates'],
 	}
-
-	exec { 'c_rehash /etc/ssl/debian/certs':
+	exec { 'refresh_ca_debian_hashes':
+		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[$updatecacertsdsa],
+		]
+	}
+	exec { 'refresh_ca_global_hashes':
+		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[$updatecacertsdsa],
+		]
 	}
+
 }