summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-04 16:42:17 -0400
committerMicah Anderson <micah@riseup.net>2013-04-04 16:42:17 -0400
commit61ee35e9210bc771f059ebf227512668c21b62b5 (patch)
tree29d447dcd47d298519b0a6be7fde85f016e5a301 /puppet
parent78cd7a3a6e098448efa9e8623d1bc5c81d7a393a (diff)
make sure the couchdb.yml permissions are set properly
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_webapp/files/migrate_design_documents3
-rw-r--r--puppet/modules/site_webapp/manifests/couchdb.pp4
2 files changed, 5 insertions, 2 deletions
diff --git a/puppet/modules/site_webapp/files/migrate_design_documents b/puppet/modules/site_webapp/files/migrate_design_documents
index 88d4b8d9..fa28e5ee 100644
--- a/puppet/modules/site_webapp/files/migrate_design_documents
+++ b/puppet/modules/site_webapp/files/migrate_design_documents
@@ -4,6 +4,7 @@ cd /srv/leap-webapp
# use admin credentials
cp config/couchdb.yml.admin config/couchdb.yml
+chown leap-webapp:leap-webapp config/couchdb.yml
# needs to be run twice
/usr/bin/bundle exec rake couchrest:migrate
@@ -11,3 +12,5 @@ cp config/couchdb.yml.admin config/couchdb.yml
# use user credentials and remove admin credentials
cp config/couchdb.yml.webapp config/couchdb.yml
+chown leap-webapp:leap-webapp config/couchdb.yml
+
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index 50c6f9d7..6fe144a4 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -27,8 +27,8 @@ class site_webapp::couchdb {
file {
'/srv/leap-webapp/config/couchdb.yml.admin':
content => template('site_webapp/couchdb.yml.admin.erb'),
- owner => leap-webapp,
- group => leap-webapp,
+ owner => root,
+ group => root,
mode => '0600';
'/srv/leap-webapp/config/couchdb.yml.webapp':