From 3c52477a6c0cb4d4cc3caee2aea350acc51a5c8a Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 10 Dec 2012 23:16:27 +0100
Subject: also deploy ca_cert

---
 puppet/modules/site_ca_daemon/manifests/init.pp | 33 ++++++++++++++-----------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'puppet')

diff --git a/puppet/modules/site_ca_daemon/manifests/init.pp b/puppet/modules/site_ca_daemon/manifests/init.pp
index aa9219c1..db76e0fb 100644
--- a/puppet/modules/site_ca_daemon/manifests/init.pp
+++ b/puppet/modules/site_ca_daemon/manifests/init.pp
@@ -3,7 +3,7 @@ class site_ca_daemon {
   #$definition_files = hiera('definition_files')
   #$provider         = $definition_files['provider']
   #$eip_service      = $definition_files['eip_service']
-  $x509             = hiera('x509') 
+  $x509             = hiera('x509')
 
   Class[Ruby] -> Class[rubygems] -> Class[bundler::install]
 
@@ -29,17 +29,24 @@ class site_ca_daemon {
   }
 
 
-  x509::key {                                                                   
-    'leap_ca_daemon':                                                           
-      content => $x509['cert'],                                               
-      #notify  => Service[apache];                                               
-  }                                                                             
-                                                                                
-  x509::cert {                                                                  
-    'leap_ca_daemon':                                                           
-      content => $x509['key'],                                              
-      #notify  => Service[apache];                                               
-  }    
+  x509::key {
+    'leap_ca_daemon':
+      content => $x509['key'],
+      #notify  => Service[apache];
+  }
+
+  x509::cert {
+    'leap_ca_daemon':
+      content => $x509['cert'],
+      #notify  => Service[apache];
+  }
+
+  x509::ca {
+    'leap_ca_daemon':
+      content => $x509['ca_cert'],
+      #notify  => Service[apache];
+  }
+
 
   file { '/srv/leap_ca_daemon':
     ensure  => directory,
@@ -66,6 +73,4 @@ class site_ca_daemon {
     require => [ Class['bundler::install'], Vcsrepo['/srv/leap_ca_daemon'] ];
   }
 
-
-
 }
-- 
cgit v1.2.3