replace long-form variables with shorter ones

remove unnecessary bigcouch_replication_client_default values (verify, rndfile, debuglevel)

1 files changed, 3 insertions, 6 deletions

diff --git a/puppet/modules/site_couchdb/manifests/stunnel.pp b/puppet/modules/site_couchdb/manifests/stunnel.pp
index 9e1bad49..a49b51b9 100644
--- a/puppet/modules/site_couchdb/manifests/stunnel.pp
+++ b/puppet/modules/site_couchdb/manifests/stunnel.pp
@@ -49,12 +49,9 @@ class site_couchdb::stunnel ($key, $cert, $ca) {
   $couchdb_stunnel_client_defaults = {
     'connect_port' => '5369',
     'client'       => true,
-    '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'
+    'cafile'       => $ca_path,
+    'key'          => $key_path,
+    'cert'         => $cert_path,
   }
   create_resources(site_stunnel::clients, hiera('stunnel'), $couchdb_stunnel_client_defaults)