diff options
| author | varac <varacanero@zeromail.org> | 2013-03-19 15:14:35 +0100 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-02 10:21:05 -0400 |
| commit | 4669a64cb8e63a67825a35513b51b4e1f2a4ec5d (patch) | |
| tree | e999b93c1be8cfb440958366439dcc41990cd806 /puppet/modules/site_webapp | |
| parent | 4b2aa1020d07d0ab25f907fbc6c76a3d78a6a84e (diff) | |
moving generic stunnel config from site_webapp to site_stunnel now working
Diffstat (limited to 'puppet/modules/site_webapp')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/couchdb.pp | 8 |
1 files changed, 4 insertions, 4 deletions
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' |