Enforce SSL configuration using puppet, add dirs for debian and global CAs

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

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index c9fbbf3613cfa4f3d114a7403572c50608380566..127869a0a7ce0bd1e94166bd36606994b9715561 100644 (file)
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,6 +1,4 @@
 class ssl {
-
-       $cacert = 'mozilla/UTN_USERFirst_Hardware_Root_CA.crt'
        $caconf = '/etc/ca-certificates.conf'
 
        package { 'openssl':
@@ -13,19 +11,74 @@ class ssl {
                ensure   => installed,
        }
 
+       file { '/etc/ca-certificates.conf':
+               content => "# This file is under puppet control\n# Only debian.org service certs are trusted, see /etc/ssl/certs/README",
+               notify  => Exec['refresh_normal_hashes'],
+       }
+       file { '/etc/ca-certificates-debian.conf':
+               mode    => '0444',
+               content => "# This file is under puppet control\n# Only the CAs for debian.org are trusted, see /etc/ssl/ca-debian/README\nmozilla/AddTrust_External_Root.crt",
+               notify  => Exec['refresh_ca_debian_hashes'],
+       }
+       file { '/etc/ca-certificates-global.conf':
+               content => "# This file is under puppet control\n# All CAs are trusted, see /etc/ssl/ca-global/README",
+               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'],
+       }
+       file { '/etc/ssl/private/ssl-cert-snakeoil.key':
+               ensure => absent,
+       }
+
        file { '/etc/ssl/servicecerts':
+               ensure   => link,
+               purge    => true,
+               force    => true,
+               target   => '/usr/local/share/ca-certificates/debian.org',
+               notify   => Exec['retire_debian_links'],
+       }
+
+       file { '/usr/local/share/ca-certificates/debian.org':
                ensure   => directory,
                source   => 'puppet:///modules/ssl/servicecerts/',
-               mode     => '0644',
+               mode     => '0644', # this works; otherwise all files are +x
                purge    => true,
                recurse  => true,
                force    => true,
-               notify   => Exec['refresh_debian_links'],
+               notify   => Exec['refresh_normal_hashes'],
+       }
+       file { '/etc/ssl/certs/README':
+               mode   => '0444',
+               source => 'puppet:///modules/ssl/README.certs',
+       }
+       file { '/etc/ssl/ca-debian':
+               ensure => directory,
+               mode   => '0755',
+       }
+       file { '/etc/ssl/ca-debian/README':
+               mode   => '0444',
+               source => 'puppet:///modules/ssl/README.ca-debian',
+       }
+       file { '/etc/ssl/ca-global':
+               ensure => directory,
+               mode   => '0755',
+       }
+       file { '/etc/ssl/ca-debian/README':
+               mode   => '0444',
+               source => 'puppet:///modules/ssl/README.ca-global',
        }
        file { '/etc/ssl/debian':
                ensure   => directory,
                source   => 'puppet:///files/empty/',
-               mode     => '0644',
+               mode     => '0644', # this works; otherwise all files are +x
                purge    => true,
                recurse  => true,
                force    => true,
@@ -72,29 +125,21 @@ class ssl {
                require => Package['ssl-cert'],
        }
 
-       exec { 'refresh_debian_links':
-               command     => 'cp -f -s ../servicecerts/* .',
-               cwd         => '/etc/ssl/certs',
-               refreshonly => true,
-               notify      => Exec['delete_unused_links'],
+       file { '/usr/local/sbin/update-ca-certificates-dsa':
+               mode   => '0555',
+               source => 'puppet:///modules/ssl/update-ca-certificates-dsa',
        }
-       exec { 'delete_unused_links':
-               command     => 'find -L . -mindepth 1 -maxdepth 1 -type l -delete',
+
+       exec { 'retire_debian_links':
+               command     => 'find -lname "../servicecerts/*" -exec rm {} +',
                cwd         => '/etc/ssl/certs',
                refreshonly => true,
-               notify      => Exec['refresh_normal_hashes'], # see NOTE 1
-       }
-       exec { 'modify_configuration':
-               command     => "sed -i -e 's#!${cacert}#${cacert}' ${caconf}",
-               onlyif      => "grep -Fqx '!${cacert}' ${caconf}",
                notify      => Exec['refresh_normal_hashes'],
-               require     => Package['ca-certificates'],
        }
        exec { 'refresh_debian_hashes':
-               command     => '/usr/bin/c_rehash .',
-               cwd         => '/etc/ssl/debian/certs',
+               command     => 'c_rehash /etc/ssl/debian/certs',
                refreshonly => true,
-               require     => Package['openssl']
+               require     => Package['openssl'],
        }
        exec { 'refresh_normal_hashes':
                # NOTE 1: always use update-ca-certificates to manage hashes in
@@ -106,5 +151,25 @@ class ssl {
                refreshonly => true,
                require     => Package['ca-certificates'],
        }
+       exec { 'refresh_ca_debian_hashes':
+               command     => '/usr/local/sbin/update-ca-certificates-dsa --fresh --certsconf /etc/ca-certificates-debian.conf --localcertsdir /dev/null --etccertsdir /etc/ssl/ca-debian --hooksdir /dev/null',
+               refreshonly => true,
+               require     => [
+                       Package['ca-certificates'],
+                       File['/etc/ssl/ca-debian'],
+                       File['/etc/ca-certificates-debian.conf'],
+                       File['/usr/local/sbin/update-ca-certificates-dsa'],
+               ]
+       }
+       exec { 'refresh_ca_global_hashes':
+               command     => '/usr/local/sbin/update-ca-certificates-dsa --fresh --default --certsconf /etc/ca-certificates-global.conf --etccertsdir /etc/ssl/ca-global --hooksdir /dev/null',
+               refreshonly => true,
+               require     => [
+                       Package['ca-certificates'],
+                       File['/etc/ssl/ca-global'],
+                       File['/etc/ca-certificates-global.conf'],
+                       File['/usr/local/sbin/update-ca-certificates-dsa'],
+               ]
+       }
 
 }