Fix typo

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

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 37423a9..85e7e35 100644 (file)
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -19,9 +19,14 @@ class ssl {
                source => 'puppet:///modules/ssl/ca-certificates.conf',
                notify  => Exec['refresh_normal_hashes'],
        }
+       if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
+               $ca_debian_conf_suffix = ''
+       } else {
+               $ca_debian_conf_suffix = '-wheezy'
+       }
        file { '/etc/ca-certificates-debian.conf':
                mode    => '0444',
-               source => 'puppet:///modules/ssl/ca-certificates-debian.conf',
+               source => "puppet:///modules/ssl/ca-certificates-debian${ca_debian_conf_suffix}.conf",
                notify  => Exec['refresh_ca_debian_hashes'],
        }
        file { '/etc/ca-certificates-global.conf':
@@ -57,7 +62,7 @@ class ssl {
                purge    => true,
                recurse  => true,
                force    => true,
-               notify   => Exec['refresh_normal_hashes'],
+               notify   => [ Exec['refresh_normal_hashes'], Exec['refresh_ca_global_hashes'] ],
        }
        file { '/etc/ssl/certs/README':
                ensure => absent,
@@ -116,6 +121,7 @@ class ssl {
        }
        file { '/etc/ssl/debian/keys':
                ensure => absent,
+               force    => true,
        }
        file { '/etc/ssl/private/thishost.key':
                source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",