manage /etc/ca-certificates.conf because gandi

[dsa-puppet.git] / modules / ssl / manifests / init.pp

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index af909f869dd7c621ca747129a6f2c14b97283288..e8d68a4f16da090cc34e2763cbf765d32eecbfa0 100644 (file)
--- 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,13 +74,14 @@ 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']
        }
 
        exec { 'cleanup_dead_links':
-               command     => 'find /etc/ssl/certs -mindepth 1 -maxdepth 1 -L -type l -delete',
+               command     => 'find -L /etc/ssl/certs -mindepth 1 -maxdepth 1 -type l -delete',
                refreshonly => true,
                notify      => Exec['c_rehash /etc/ssl/certs']
        }
@@ -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
+       }
+
 }