Merge remote-tracking branch 'origin/master' into staging

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

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index a63f8f7..ee83067 100644 (file)
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,6 +1,4 @@
 class ssl {
-       $caconf = '/etc/ca-certificates.conf'
-
        package { 'openssl':
                ensure   => installed,
        }
@@ -29,7 +27,7 @@ class ssl {
        }
        file { '/etc/ca-certificates-debian.conf':
                mode    => '0444',
-               source => 'puppet:///modules/ssl/ca-certificates-debian.conf',
+               source => 'puppet:///modules/ssl/ca-certificates.conf',
                notify  => Exec['refresh_ca_debian_hashes'],
        }
        file { '/etc/ca-certificates-global.conf':
@@ -37,11 +35,6 @@ class ssl {
                notify  => Exec['refresh_ca_global_hashes'],
        }
 
-       file { '/etc/apt/apt.conf.d/local-ssl-ca-global':
-               mode   => '0444',
-               source => 'puppet:///modules/ssl/local-ssl-ca-global',
-       }
-
        file { '/etc/ssl/certs/ssl-cert-snakeoil.pem':
                ensure => absent,
                notify => Exec['refresh_normal_hashes'],
@@ -51,17 +44,11 @@ class ssl {
        }
 
        file { '/etc/ssl/servicecerts':
-               ensure   => link,
-               purge    => true,
-               force    => true,
-               target   => '/usr/local/share/ca-certificates/debian.org',
-               notify   => Exec['retire_debian_links'],
+               ensure   => absent,
        }
 
        file { '/usr/local/share/ca-certificates/debian.org':
-               ensure   => directory,
-               source   => 'puppet:///modules/ssl/servicecerts/',
-               mode     => '0644', # this works; otherwise all files are +x
+               ensure   => absent,
                purge    => true,
                recurse  => true,
                force    => true,
@@ -153,12 +140,12 @@ class ssl {
                $updatecacerts = $updatecacertsdsa
        }
 
-       exec { 'retire_debian_links':
-               command     => 'find -lname "../servicecerts/*" -exec rm {} +',
-               cwd         => '/etc/ssl/certs',
-               refreshonly => true,
-               notify      => Exec['refresh_normal_hashes'],
+       file { '/etc/apt/apt.conf.d/local-ssl-ca-global':
+               mode   => '0444',
+               content => template('ssl/local-ssl-ca-global.erb'),
        }
+
+
        exec { 'refresh_debian_hashes':
                command     => 'c_rehash /etc/ssl/debian/certs',
                refreshonly => true,