diff options
author | varac <varacanero@zeromail.org> | 2013-10-31 19:02:09 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-10-31 19:02:09 +0100 |
commit | fc6bbacbd42209d24de35e841e72b9f9ef1349ea (patch) | |
tree | 5a21994dd1ee40bae965e6865329e35bf9baeb61 /puppet/modules/site_couchdb/manifests/init.pp | |
parent | 94db97455250a3eb92ed7e55c23ce0f6d991e206 (diff) | |
parent | ce084fbbe5980497b8b3f3e643e6b618c4fa0b0a (diff) |
Merge branch 'feature/4350_local_couchdb_backup' into develop
Diffstat (limited to 'puppet/modules/site_couchdb/manifests/init.pp')
-rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 5d77c994..684d3ab7 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -16,6 +16,8 @@ class site_couchdb { $couchdb_soledad_pw = $couchdb_soledad['password'] $couchdb_soledad_salt = $couchdb_soledad['salt'] + $couchdb_backup = $couchdb_config['backup'] + $bigcouch_config = $couchdb_config['bigcouch'] $bigcouch_cookie = $bigcouch_config['cookie'] @@ -96,4 +98,27 @@ class site_couchdb { include site_shorewall::couchdb include site_shorewall::couchdb::bigcouch + + # /etc/couchdb/couchdb.netrc is deployed by the couchdb module + # needed for couchdb_scripts (backup) and makes life easier + # for the admin (i.e. using curl/wget without passing credentials) + + file { '/root/.netrc': + ensure => link, + target => '/etc/couchdb/couchdb.netrc' + } + + file { '/srv/leap/couchdb': + ensure => directory + } + + vcsrepo { '/srv/leap/couchdb/scripts': + ensure => present, + provider => git, + source => 'https://leap.se/git/couchdb_scripts', + revision => 'origin/master', + require => File['/srv/leap/couchdb'] + } + + if $couchdb_backup { include site_couchdb::backup } } |