diff options
| author | varac <varacanero@zeromail.org> | 2012-12-07 16:39:18 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-12-07 16:39:18 +0100 |
| commit | febd4532872d8b3b6b6e846a6399a63152fac9a0 (patch) | |
| tree | 1c7241fe9a136c6349fdc54a6ce77521c13d2cda /puppet/modules/site_couchdb/manifests/init.pp | |
| parent | d6e09121a9f3d7aa4b6d5897cddf8a0ec7227823 (diff) | |
removed pinning couchdb to unstable because 1.2.0-3 is in wheezy, finally
Diffstat (limited to 'puppet/modules/site_couchdb/manifests/init.pp')
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 10408094..3f577d8b 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,5 +1,7 @@ class site_couchdb { + include couchdb + $x509 = hiera('x509') $key = $x509['key'] $cert = $x509['cert'] @@ -15,9 +17,7 @@ class site_couchdb { $couchdb_ca_daemon_user = $couchdb_ca_daemon['username'] $couchdb_ca_daemon_pw = $couchdb_ca_daemon['password'] - Class['site_couchdb::package'] - -> Exec['refresh_apt'] - -> Package ['couchdb'] + Package ['couchdb'] -> File['/etc/init.d/couchdb'] -> File['/etc/couchdb/local.ini'] -> File['/etc/couchdb/local.d/admin.ini'] @@ -28,8 +28,6 @@ class site_couchdb { -> Couchdb::Add_user[$couchdb_ca_daemon_user] -> Site_couchdb::Apache_ssl_proxy['apache_ssl_proxy'] - # Setup couchdb - include site_couchdb::package include site_couchdb::configure include couchdb::deploy_config |