X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=81bdb893ddb3f6829bc479caebb3d4b4eff9a63d;hb=2e0c132da353f3fcde913834a9e32a92cf21a4ab;hp=20a0030740494525e30c2f4415d87d6c8b810094;hpb=53c921fcea04facf874254f940d850d3e62d60f1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 20a003074..81bdb893d 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -5,7 +5,7 @@ class ssl {
         "/etc/ssl/debian":
           ensure  => directory,
           mode    => 755,
-          purge   => true
+          purge   => true,
           recurse => true,
           force   => true,
           source  => "puppet:///files/empty/"
@@ -13,9 +13,6 @@ class ssl {
         "/etc/ssl/debian/certs":
           ensure  => directory,
           mode    => 755,
-          purge   => true,
-          force   => true,
-          recurse => true,
           source  => "puppet:///files/empty/"
         ;
         "/etc/ssl/debian/crls":
@@ -29,13 +26,13 @@ class ssl {
         "/etc/ssl/debian/keys":
           ensure  => directory,
           mode    => 750,
-          purge   => true
+          purge   => true,
           force   => true,
           recurse => true,
           source  => "puppet:///files/empty/"
         ;
         "/etc/ssl/debian/certs/thishost.crt":
-          source  => "puppet:///ssl/clientcerts/$fqdn.crt",
+          source  => "puppet:///ssl/clientcerts/$fqdn.client.crt",
           notify  => Exec["c_rehash /etc/ssl/debian/certs"],
           ;
         "/etc/ssl/debian/keys/thishost.key":
@@ -43,11 +40,11 @@ class ssl {
           mode    => 640
           ;
         "/etc/ssl/debian/certs/ca.crt":
-          source  => "puppet:///exim/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:///exim/certs/ca.crl",
+          source  => "puppet:///ssl/clientcerts/ca.crl",
           ;
     }