moving generic stunnel config from site_webapp to site_stunnel now working

1 files changed, 12 insertions, 19 deletions

diff --git a/puppet/modules/site_stunnel/manifests/clients.pp b/puppet/modules/site_stunnel/manifests/clients.pp
index 28ed6d3c..9f8aeaff 100644
--- a/puppet/modules/site_stunnel/manifests/clients.pp
+++ b/puppet/modules/site_stunnel/manifests/clients.pp
@@ -10,23 +10,16 @@ define site_stunnel::clients (
   $rndfile    = '/var/lib/stunnel4/.rnd',
   $debuglevel = '4' ) {
 
-  $couchdb_stunnel_client_defaults = {
-    'cafile'     => $ca_path,
-    'key'        => $key_path,
-    'cert'       => $cert_path,
-  }
-
-
-    stunnel::service { $name:
-      accept     => "127.0.0.1:${accept_port}",
-      connect    => "${connect}:6984",
-      client     => $client,
-      cafile     => $cafile,
-      key        => $key,
-      cert       => $cert,
-      verify     => $verify,
-      pid        => "/var/run/stunnel4/${pid}.pid",
-      rndfile    => $rndfile,
-      debuglevel => $debuglevel
-    }
+  stunnel::service { $name:
+    accept     => "127.0.0.1:${accept_port}",
+    connect    => "${connect}:6984",
+    client     => $client,
+    cafile     => $cafile,
+    key        => $key,
+    cert       => $cert,
+    verify     => $verify,
+    pid        => "/var/run/stunnel4/${pid}.pid",
+    rndfile    => $rndfile,
+    debuglevel => $debuglevel
   }
+}