X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=270a3c0b43948b0eb3abb5c8c1c0e13381dd2a2e;hb=80174ec18891d09b9cb20fccb58948400e3db6b4;hp=af909f869dd7c621ca747129a6f2c14b97283288;hpb=2f29af86b18f40bd4d62f108536e618ac64a59a0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index af909f869..270a3c0b4 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,67 +1,77 @@
 class ssl {
 
-	package {
-		'openssl':
-			ensure => installed,
-			;
-		'ssl-cert':
-			ensure => installed,
-			;
+	$cacert = 'mozilla/UTN_USERFirst_Hardware_Root_CA.crt'
+	$caconf = '/etc/ca-certificates.conf'
+
+	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']
+		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'],
+	}
 	file { '/etc/ssl/debian':
-		ensure  => directory,
-		mode    => '0755',
-		purge   => true,
-		recurse => true,
-		force   => true,
-		source  => 'puppet:///files/empty/'
+		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/certs':
-		ensure => directory,
-		mode   => '0755',
+		ensure  => directory,
+		mode    => '0755',
 	}
 	file { '/etc/ssl/debian/crls':
-		ensure => directory,
-		mode   => '0755',
+		ensure  => directory,
+		mode    => '0755',
 	}
 	file { '/etc/ssl/debian/keys':
-		ensure => directory,
-		group  => ssl-cert,
-		mode   => '0750',
+		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['c_rehash /etc/ssl/debian/certs'],
+		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',
+		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['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-server.key':
 		source  => "puppet:///modules/exim/certs/${::fqdn}.key",
@@ -70,23 +80,26 @@ class ssl {
 		require => Package['ssl-cert'],
 	}
 
-	exec { 'make_new_service_links':
-		command     => 'cp --symbolic-link /etc/ssl/servicecerts/* /etc/ssl/certs',
+	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 /etc/ssl/certs -mindepth 1 -maxdepth 1 -L -type l -delete',
+	exec { 'refresh_debian_hashes':
+		command     => 'c_rehash /etc/ssl/debian/certs',
 		refreshonly => true,
-		notify      => Exec['c_rehash /etc/ssl/certs']
-	}
-
-	exec { 'c_rehash /etc/ssl/certs':
+		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',
 		refreshonly => true,
+		require     => Package['ca-certificates'],
 	}
 
-	exec { 'c_rehash /etc/ssl/debian/certs':
-		refreshonly => true,
-	}
 }