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 7cd1583084504910b3548e672af8368afe591aa8..bdc8ff5f21ec9005191760119aa4ef17735a5c61 100644 (file)
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -1,60 +1,92 @@
 class ssl {
-    package { openssl: ensure => installed }
-
-    file {
-        "/etc/ssl/debian":
-          ensure  => directory,
-          mode    => 755,
-          purge   => true
-          recurse => true,
-          force   => true,
-          source  => "puppet:///files/empty/"
-        ;
-        "/etc/ssl/debian/certs":
-          ensure  => directory,
-          mode    => 755,
-          purge   => true,
-          force   => true,
-          recurse => true,
-          source  => "puppet:///files/empty/"
-        ;
-        "/etc/ssl/debian/crls":
-          ensure  => directory,
-          mode    => 755,
-          purge   => true,
-          force   => true,
-          recurse => true,
-          source  => "puppet:///files/empty/"
-        ;
-        "/etc/ssl/debian/keys":
-          ensure  => directory,
-          mode    => 750,
-          purge   => true
-          force   => true,
-          recurse => true,
-          source  => "puppet:///files/empty/"
-        ;
-        "/etc/ssl/debian/certs/thishost.crt":
-          source  => "puppet:///ssl/clientcerts/$fqdn.crt",
-          notify  => Exec["c_rehash /etc/ssl/debian/certs"],
-          ;
-        "/etc/ssl/debian/keys/thishost.key":
-          source  => "puppet:///ssl/clientcerts/$fqdn.key",
-          mode    => 640
-          ;
-        "/etc/ssl/debian/certs/ca.crt":
-          source  => "puppet:///ssl/clientcerts/ca.crt",
-          notify  => Exec["c_rehash /etc/ssl/debian/certs"],
-          ;
-        "/etc/ssl/debian/crls/ca.crl":
-          source  => "puppet:///ssl/clientcerts/ca.crl",
-          ;
-    }
-
-    exec { "c_rehash /etc/ssl/debian/certs":
-        refreshonly => true,
-    }
+
+       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':
+               ensure  => directory,
+               mode    => '0755',
+               purge   => true,
+               recurse => true,
+               force   => true,
+               source  => 'puppet:///files/empty/'
+       }
+       file { '/etc/ssl/debian/certs':
+               ensure => directory,
+               mode   => '0755',
+       }
+       file { '/etc/ssl/debian/crls':
+               ensure => directory,
+               mode   => '0755',
+       }
+       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",
+               notify => Exec['c_rehash /etc/ssl/debian/certs'],
+       }
+       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['c_rehash /etc/ssl/debian/certs'],
+       }
+       file { '/etc/ssl/debian/crls/ca.crl':
+               source  => 'puppet:///modules/ssl/clientcerts/ca.crl',
+       }
+
+       file { '/etc/ssl/debian/certs/thishost-server.crt':
+               source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
+               notify => Exec['c_rehash /etc/ssl/debian/certs'],
+       }
+       file { '/etc/ssl/debian/keys/thishost-server.key':
+               source  => "puppet:///modules/exim/certs/${::fqdn}.key",
+               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':
+               refreshonly => true,
+       }
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: