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

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index dc6adc3d6..26c82252c 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -9,21 +9,23 @@ class ssl {
 			;
 	}
 
-	file { '/etc/ssl/debian':
+	file { '/etc/ssl/servicecerts':
 		ensure  => directory,
 		mode    => '0755',
 		purge   => true,
 		recurse => true,
 		force   => true,
-		source  => 'puppet:///files/empty/'
+		source  => 'puppet:///modules/ssl/servicecerts/',
+		notify  => Exec['make_new_service_links']
 	}
-	file { '/etc/ssl/certs':
+
+	file { '/etc/ssl/debian':
 		ensure  => directory,
-		source  => 'puppet:///modules/ssl/servicecerts/',
-		recurse => true,
 		mode    => '0755',
-		ignore  => '*[^c][^r][^t]',
-		notify  => Exec['c_rehash /etc/ssl/certs'],
+		purge   => true,
+		recurse => true,
+		force   => true,
+		source  => 'puppet:///files/empty/'
 	}
 	file { '/etc/ssl/debian/certs':
 		ensure => directory,
@@ -68,10 +70,24 @@ class ssl {
 		require => Package['ssl-cert'],
 	}
 
-	exec { 'c_rehash /etc/ssl/debian/certs':
+	exec { 'make_new_service_links':
+		command     => 'cp -f --symbolic-link ../servicecerts/* .',
+		cwd         => '/etc/ssl/certs',
+		refreshonly => true,
+		notify      => Exec['cleanup_dead_links']
+	}
+
+	exec { 'cleanup_dead_links':
+		command     => 'find -L /etc/ssl/certs -mindepth 1 -maxdepth 1 -type l -delete',
 		refreshonly => true,
+		notify      => Exec['c_rehash /etc/ssl/certs']
 	}
+
 	exec { 'c_rehash /etc/ssl/certs':
 		refreshonly => true,
 	}
+
+	exec { 'c_rehash /etc/ssl/debian/certs':
+		refreshonly => true,
+	}
 }