diff options
| author | Micah Anderson <micah@riseup.net> | 2013-03-31 12:22:52 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-02 10:21:06 -0400 |
| commit | dd459efb1063de6c11f9f11583290c6a0891436a (patch) | |
| tree | a73eb2b05448969e64ff5434ceb76b8704266348 | |
| parent | 6714ff4ae1a53b6b3eda66f13c2212c3ba285bf3 (diff) | |
replace long-form variables with shorter ones
remove unnecessary bigcouch_replication_client_default values (verify, rndfile, debuglevel)
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/stunnel.pp | 9 |
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) |