X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=bc4ae9f095159068ea2cec74d1a011b367ca873e;hb=2f7cea2feb5fb85c0f91f76bc23fb3b87bc985d6;hp=fac2e15bc1335d867a983b0415a47616b5ecfe8a;hpb=8e6d392405a95b9f372e37e7883817232aa70f7c;p=dsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index fac2e15b..bc4ae9f0 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,62 +1,109 @@
 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,
+		source   => 'puppet:///modules/ssl/servicecerts/',
+		mode     => '0644', # this works; otherwise all files are +x
+		purge    => true,
+		recurse  => true,
+		force    => true,
+		notify   => Exec['refresh_debian_links'],
+	}
 	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",
-		group   => ssl-cert,
 		mode    => '0440',
+		group   => ssl-cert,
+		require => Package['ssl-cert'],
 	}
 
-	exec { 'c_rehash /etc/ssl/debian/certs':
+	exec { 'refresh_debian_links':
+		command     => 'cp -f -s ../servicecerts/* .',
+		cwd         => '/etc/ssl/certs',
+		refreshonly => true,
+		notify      => Exec['delete_unused_links'],
+	}
+	exec { 'delete_unused_links':
+		command     => 'find -L . -mindepth 1 -maxdepth 1 -type l -delete',
+		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     => 'c_rehash /etc/ssl/debian/certs',
+		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',
+		refreshonly => true,
+		require     => Package['ca-certificates'],
+	}
+
 }