summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/site_webapp/manifests')
-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,