X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=e8d68a4f16da090cc34e2763cbf765d32eecbfa0;hb=cb2d75d6ae0a5619f2a389f973d447425f2ef362;hp=bdc8ff5f21ec9005191760119aa4ef17735a5c61;hpb=1a278851da56f9748f48b817ecbda806f6a0331c;p=dsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index bdc8ff5f..e8d68a4f 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -7,6 +7,9 @@ class ssl {
 		'ssl-cert':
 			ensure => installed,
 			;
+		'ca-certificates':
+			ensure => installed,
+			;
 	}
 
 	file { '/etc/ssl/servicecerts':
@@ -71,7 +74,8 @@ class ssl {
 	}
 
 	exec { 'make_new_service_links':
-		command     => 'cp --symbolic-link /etc/ssl/servicecerts/* /etc/ssl/certs',
+		command     => 'cp -f --symbolic-link ../servicecerts/* .',
+		cwd         => '/etc/ssl/certs',
 		refreshonly => true,
 		notify      => Exec['cleanup_dead_links']
 	}
@@ -89,4 +93,17 @@ class ssl {
 	exec { 'c_rehash /etc/ssl/debian/certs':
 		refreshonly => true,
 	}
+
+	exec { 'modify_ca_certificates_conf':
+		command     => 'sed -i -e \'s#!mozilla/UTN_USERFirst_Hardware_Root_CA.crt#mozilla/UTN_USERFirst_Hardware_Root_CA.crt#\' /etc/ca-certificates.conf',
+		cwd         => '/etc/ssl/certs',
+		onlyif      => 'grep -Fqx \'!mozilla/UTN_USERFirst_Hardware_Root_CA.crt\' /etc/ca-certificates.conf',
+		notify	    => Exec['update_ca_certificates']
+	}
+	exec { 'update_ca_certificates':
+		command     => '/usr/sbin/update-ca-certificates',
+		cwd         => '/etc/ssl/certs',
+		refreshonly => true
+	}
+
 }