From 3e5e685200e9b5c3ac8567100e552929ea55d8e8 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 13 Sep 2013 16:20:07 +0200
Subject: setup stunnel config to use default x509 cert,key+ca (#3837)

* fix stunnel setups for couchdb, mx, webapp services
---
 puppet/modules/site_webapp/manifests/couchdb.pp | 8 +-------
 1 file changed, 1 insertion(+), 7 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 4bafc7f3..f9a4eb6b 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -60,13 +60,7 @@ class site_webapp::couchdb {
       mode   => '0744';
   }
 
-  site_stunnel::setup { 'webapp_couchdb':
-    cert_name => $cert_name,
-    key       => $key,
-    cert      => $cert,
-    ca_name   => $ca_name,
-    ca        => $ca
-  }
+  include site_stunnel
 
   exec { 'migrate_design_documents':
     cwd      => '/srv/leap/webapp',
-- 
cgit v1.2.3