From 4669a64cb8e63a67825a35513b51b4e1f2a4ec5d Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 19 Mar 2013 15:14:35 +0100
Subject: moving generic stunnel config from site_webapp to site_stunnel now
 working

---
 puppet/modules/site_webapp/manifests/couchdb.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'puppet/modules/site_webapp')

diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index e45691c1..48a95c8d 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -34,7 +34,7 @@ class site_webapp::couchdb {
   }
 
   class { 'site_stunnel::setup':
-    cert_name => 'leap_couchdb',
+    cert_name => $cert_name,
     key       => $key,
     cert      => $cert,
     ca        => $ca
@@ -49,9 +49,9 @@ class site_webapp::couchdb {
 
   $couchdb_stunnel_client_defaults = {
     'client'     => true,
-    'cafile'     => $ca_path,
-    'key'        => $key_path,
-    'cert'       => $cert_path,
+    'cafile'     => "${x509::variables::local_CAs}/${ca_name}.crt",
+    'key'        => "${x509::variables::keys}/${cert_name}.key",
+    'cert'       => "${x509::variables::certs}/${cert_name}.crt",
     'verify'     => '2',
     'rndfile'    => '/var/lib/stunnel4/.rnd',
     'debuglevel' => '4'
-- 
cgit v1.2.3