it's an argument, not a predicate

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

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 062cf8dc420c140f18d23f190bde21ee0d025697..bdc8ff5f21ec9005191760119aa4ef17735a5c61 100644 (file)
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,7 +1,22 @@
 class ssl {
 
-       package { 'openssl':
-               ensure => installed
+       package {
+               'openssl':
+                       ensure => installed,
+                       ;
+               'ssl-cert':
+                       ensure => installed,
+                       ;
+       }
+
+       file { '/etc/ssl/servicecerts':
+               ensure  => directory,
+               mode    => '0755',
+               purge   => true,
+               recurse => true,
+               force   => true,
+               source  => 'puppet:///modules/ssl/servicecerts/',
+               notify  => Exec['make_new_service_links']
        }
 
        file { '/etc/ssl/debian':
@@ -22,7 +37,9 @@ class ssl {
        }
        file { '/etc/ssl/debian/keys':
                ensure => directory,
+               group  => ssl-cert,
                mode   => '0750',
+               require => Package['ssl-cert'],
        }
        file { '/etc/ssl/debian/certs/thishost.crt':
                source => "puppet:///modules/ssl/clientcerts/${::fqdn}.client.crt",
@@ -30,7 +47,9 @@ class ssl {
        }
        file { '/etc/ssl/debian/keys/thishost.key':
                source => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
-               mode   => '0440'
+               mode   => '0440',
+               group   => ssl-cert,
+               require => Package['ssl-cert'],
        }
        file { '/etc/ssl/debian/certs/ca.crt':
                source => 'puppet:///modules/ssl/clientcerts/ca.crt',
@@ -46,8 +65,25 @@ class ssl {
        }
        file { '/etc/ssl/debian/keys/thishost-server.key':
                source  => "puppet:///modules/exim/certs/${::fqdn}.key",
-               group   => ssl-cert,
                mode    => '0440',
+               group   => ssl-cert,
+               require => Package['ssl-cert'],
+       }
+
+       exec { 'make_new_service_links':
+               command     => 'cp --symbolic-link /etc/ssl/servicecerts/* /etc/ssl/certs',
+               refreshonly => true,
+               notify      => Exec['cleanup_dead_links']
+       }
+
+       exec { 'cleanup_dead_links':
+               command     => 'find -L /etc/ssl/certs -mindepth 1 -maxdepth 1 -type l -delete',
+               refreshonly => true,
+               notify      => Exec['c_rehash /etc/ssl/certs']
+       }
+
+       exec { 'c_rehash /etc/ssl/certs':
+               refreshonly => true,
        }
 
        exec { 'c_rehash /etc/ssl/debian/certs':