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 17d0285..85e7e35 100644 (file)
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -11,13 +11,22 @@ class ssl {
                ensure   => installed,
        }
 
+       file { '/etc/ssl/README':
+               mode   => '0444',
+               source => 'puppet:///modules/ssl/README',
+       }
        file { '/etc/ca-certificates.conf':
                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':
@@ -53,27 +62,24 @@ 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':
-               mode   => '0444',
-               source => 'puppet:///modules/ssl/README.certs',
+               ensure => absent,
        }
        file { '/etc/ssl/ca-debian':
                ensure => directory,
                mode   => '0755',
        }
        file { '/etc/ssl/ca-debian/README':
-               mode   => '0444',
-               source => 'puppet:///modules/ssl/README.ca-debian',
+               ensure => absent,
        }
        file { '/etc/ssl/ca-global':
                ensure => directory,
                mode   => '0755',
        }
        file { '/etc/ssl/ca-global/README':
-               mode   => '0444',
-               source => 'puppet:///modules/ssl/README.ca-global',
+               ensure => absent,
        }
        file { '/etc/ssl/debian':
                ensure   => directory,
@@ -91,22 +97,10 @@ class ssl {
                ensure  => directory,
                mode    => '0755',
        }
-       file { '/etc/ssl/debian/keys':
-               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['refresh_debian_hashes'],
        }
-       file { '/etc/ssl/debian/keys/thishost.key':
-               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['refresh_debian_hashes'],
@@ -118,7 +112,24 @@ class ssl {
                source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
                notify  => Exec['refresh_debian_hashes'],
        }
+
+       file { '/etc/ssl/debian/keys/thishost.key':
+               ensure => absent,
+       }
        file { '/etc/ssl/debian/keys/thishost-server.key':
+               ensure => absent,
+       }
+       file { '/etc/ssl/debian/keys':
+               ensure => absent,
+               force    => true,
+       }
+       file { '/etc/ssl/private/thishost.key':
+               source  => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
+               mode    => '0440',
+               group   => ssl-cert,
+               require => Package['ssl-cert'],
+       }
+       file { '/etc/ssl/private/thishost-server.key':
                source  => "puppet:///modules/exim/certs/${::fqdn}.key",
                mode    => '0440',
                group   => ssl-cert,