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

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index c9fbbf361..756661e06 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,6 +1,4 @@
 class ssl {
-
-	$cacert = 'mozilla/UTN_USERFirst_Hardware_Root_CA.crt'
 	$caconf = '/etc/ca-certificates.conf'
 
 	package { 'openssl':
@@ -13,19 +11,75 @@ 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'],
+	}
+	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/apt/apt.conf.d/local-ssl-ca-global':
+		mode   => '0444',
+		source => 'puppet:///modules/ssl/local-ssl-ca-global',
+	}
+
+	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',
+		mode     => '0644', # this works; otherwise all files are +x
 		purge    => true,
 		recurse  => true,
 		force    => true,
-		notify   => Exec['refresh_debian_links'],
+		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/ca-debian/README':
+		ensure => absent,
+	}
+	file { '/etc/ssl/ca-global':
+		ensure => directory,
+		mode   => '0755',
+	}
+	file { '/etc/ssl/ca-global/README':
+		ensure => absent,
 	}
 	file { '/etc/ssl/debian':
 		ensure   => directory,
 		source   => 'puppet:///files/empty/',
-		mode     => '0644',
+		mode     => '0644', # this works; otherwise all files are +x
 		purge    => true,
 		recurse  => true,
 		force    => true,
@@ -38,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'],
@@ -65,46 +107,90 @@ 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'],
 	}
 
-	exec { 'refresh_debian_links':
-		command     => 'cp -f -s ../servicecerts/* .',
-		cwd         => '/etc/ssl/certs',
-		refreshonly => true,
-		notify      => Exec['delete_unused_links'],
+	$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 { 'delete_unused_links':
-		command     => 'find -L . -mindepth 1 -maxdepth 1 -type l -delete',
+
+	exec { 'retire_debian_links':
+		command     => 'find -lname "../servicecerts/*" -exec rm {} +',
 		cwd         => '/etc/ssl/certs',
 		refreshonly => true,
-		notify      => Exec['refresh_normal_hashes'], # see NOTE 1
-	}
-	exec { 'modify_configuration':
-		command     => "sed -i -e 's#!${cacert}#${cacert}' ${caconf}",
-		onlyif      => "grep -Fqx '!${cacert}' ${caconf}",
 		notify      => Exec['refresh_normal_hashes'],
-		require     => Package['ca-certificates'],
 	}
 	exec { 'refresh_debian_hashes':
-		command     => '/usr/bin/c_rehash .',
-		cwd         => '/etc/ssl/debian/certs',
+		command     => 'c_rehash /etc/ssl/debian/certs',
 		refreshonly => true,
-		require     => Package['openssl']
+		require     => Package['openssl'],
+	}
+	if $::hostname == 'godard' {
+		$extra_ssl_certs_flags = ' --default'
+	} else {
+		$extra_ssl_certs_flags = ''
 	}
+
 	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     => "${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],
+		]
+	}
 
 }