diff options
| author | varac <varacanero@zeromail.org> | 2013-03-16 15:01:48 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-03-16 15:01:48 +0100 |
| commit | 8c91365ca62d6f7e970f7a1fbda7be82a1fc83c3 (patch) | |
| tree | 5ca58ed2e9d52f7bd4071b6902cba064a75d81f6 /puppet/modules/site_couchdb/manifests/init.pp | |
| parent | a275999ab39b49afa2bb0c998c58aec424b4a8c0 (diff) | |
| parent | 90c5b205c4764351e6ea707b965c5e6daca1c0b7 (diff) | |
Merge branch 'stunnel_switch' into develop
Diffstat (limited to 'puppet/modules/site_couchdb/manifests/init.pp')
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 25956938..d317de65 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -4,6 +4,7 @@ class site_couchdb ( $bigcouch = false ) { $x509 = hiera('x509') $key = $x509['key'] $cert = $x509['cert'] + $ca = $x509['ca_cert'] $couchdb_config = hiera('couch') $couchdb_users = $couchdb_config['users'] $couchdb_admin = $couchdb_users['admin'] @@ -30,11 +31,15 @@ class site_couchdb ( $bigcouch = false ) { -> Couchdb::Create_db['client_certificates'] -> Couchdb::Add_user[$couchdb_webapp_user] -> Couchdb::Add_user[$couchdb_ca_daemon_user] - -> Site_couchdb::Apache_ssl_proxy['apache_ssl_proxy'] - site_couchdb::apache_ssl_proxy { 'apache_ssl_proxy': - key => $key, - cert => $cert + # this is here to disable and remove the proxy + include site_couchdb::apache_ssl_proxy + + # the above apache_ssl_proxy is replaced by the following stunnel + class { 'site_couchdb::stunnel': + key => $key, + cert => $cert, + ca => $ca } couchdb::query::setup { 'localhost': |