updated leap_ca_daemon config file, deploying x509 cert+key

2 files changed, 18 insertions, 2 deletions

diff --git a/puppet/modules/site_ca_daemon/manifests/couchdb.pp b/puppet/modules/site_ca_daemon/manifests/couchdb.pp
index b5a1d2d4..f446a05b 100644
--- a/puppet/modules/site_ca_daemon/manifests/couchdb.pp
+++ b/puppet/modules/site_ca_daemon/manifests/couchdb.pp
@@ -6,8 +6,8 @@ class site_ca_daemon::couchdb {
   $couchdb_password = $ca['couchdb_user']['password']
 
   file {
-    '/srv/leap_ca_daemon/config/couchdb.yml':
-      content => template('site_ca_daemon/couchdb.yml.erb'),
+    '/etc/leap/leap_ca.yaml':
+      content => template('site_ca_daemon/leap_ca.yaml.erb'),
       owner   => leap_ca_daemon,
       group   => leap_ca_daemon,
       mode    => '0600';
diff --git a/puppet/modules/site_ca_daemon/manifests/init.pp b/puppet/modules/site_ca_daemon/manifests/init.pp
index 0bbc9030..aa9219c1 100644
--- a/puppet/modules/site_ca_daemon/manifests/init.pp
+++ b/puppet/modules/site_ca_daemon/manifests/init.pp
@@ -3,6 +3,7 @@ class site_ca_daemon {
   #$definition_files = hiera('definition_files')
   #$provider         = $definition_files['provider']
   #$eip_service      = $definition_files['eip_service']
+  $x509             = hiera('x509') 
 
   Class[Ruby] -> Class[rubygems] -> Class[bundler::install]
 
@@ -27,6 +28,19 @@ class site_ca_daemon {
     require   => [ Group['leap_ca_daemon'] ];
   }
 
+
+  x509::key {                                                                   
+    'leap_ca_daemon':                                                           
+      content => $x509['cert'],                                               
+      #notify  => Service[apache];                                               
+  }                                                                             
+                                                                                
+  x509::cert {                                                                  
+    'leap_ca_daemon':                                                           
+      content => $x509['key'],                                              
+      #notify  => Service[apache];                                               
+  }    
+
   file { '/srv/leap_ca_daemon':
     ensure  => directory,
     owner   => 'leap_ca_daemon',
@@ -52,4 +66,6 @@ class site_ca_daemon {
     require => [ Class['bundler::install'], Vcsrepo['/srv/leap_ca_daemon'] ];
   }
 
+
+
 }