summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-03-04 14:59:33 -0800
committerelijah <elijah@riseup.net>2016-03-04 14:59:33 -0800
commite7ccdeb6c98ceb6b6afcb09a31d79faba63edbad (patch)
tree4cd0eee2e6a22602a0db62d7281d06617762bf49 /puppet
parentf73c3d220769faf4dce5e8582fe8cd655f50c996 (diff)
move the location of couchdb.admin.yml so that it does not need to have its ownership reset on each deploy.
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_webapp/manifests/couchdb.pp10
1 files changed, 8 insertions, 2 deletions
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index 5cf7f953..c13052eb 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -19,12 +19,18 @@ class site_webapp::couchdb {
mode => '0600',
require => Vcsrepo['/srv/leap/webapp'];
+ # couchdb.admin.yml is a symlink to prevent the vcsrepo resource
+ # from changing its user permissions every time.
'/srv/leap/webapp/config/couchdb.admin.yml':
+ ensure => 'link',
+ target => '/srv/leap/couchdb/couchdb.admin.yml',
+ require => Vcsrepo['/srv/leap/webapp'];
+
+ '/srv/leap/couchdb/couchdb.admin.yml':
content => template('site_webapp/couchdb.admin.yml.erb'),
owner => 'root',
group => 'root',
- mode => '0600',
- require => Vcsrepo['/srv/leap/webapp'];
+ mode => '0600';
'/srv/leap/webapp/log':
ensure => directory,