diff options
| author | varac <varacanero@zeromail.org> | 2013-03-10 16:13:03 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-03-10 16:13:03 +0100 |
| commit | 0f5e0b0e5102deab700d25ca4fd4845f15db8529 (patch) | |
| tree | cdaae835c25b2f1fab5bf4de71e4fd92687235e8 | |
| parent | 46f1b83431cff1c30e7cda9bc99505d35f37f309 (diff) | |
use bigcouch in site_couchdb
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 9ecde5e6..35470b5d 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,6 +1,5 @@ -class site_couchdb { +class site_couchdb ( $bigcouch = false ) { tag 'leap_service' - include couchdb $x509 = hiera('x509') $key = $x509['key'] @@ -17,20 +16,18 @@ class site_couchdb { $couchdb_ca_daemon_user = $couchdb_ca_daemon['username'] $couchdb_ca_daemon_pw = $couchdb_ca_daemon['password'] - Package ['couchdb'] - -> File['/etc/init.d/couchdb'] - -> File['/etc/couchdb/local.ini'] - -> File['/etc/couchdb/local.d/admin.ini'] - -> File['/etc/couchdb/couchdb.netrc'] + class {'couchdb': + bigcouch => $bigcouch, + admin_pw => $couchdb_admin_pw + } + + Service ['couchdb'] -> Couchdb::Create_db['users'] -> 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'] - include site_couchdb::configure - include couchdb::deploy_config - site_couchdb::apache_ssl_proxy { 'apache_ssl_proxy': key => $key, cert => $cert |