summaryrefslogtreecommitdiff
path: root/puppet/modules/soledad/templates
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-10-01 12:06:02 +0200
committervarac <varacanero@zeromail.org>2015-10-05 13:18:44 +0200
commit4fc7419598a3baf564f063b7330b9cf9115420b5 (patch)
tree9a98dac96b6133daa3fce13329f25f25a2fc2c70 /puppet/modules/soledad/templates
parent659587b9a56274d87c8c8deda499ccea85f875b5 (diff)
[feat] Create-user-db: use couchdb admin rights
- create soledad-admin user - deploy netrc file for userdb creation - Move soledad-server.conf from /etc/leap to /etc/soledad - make soledad-server.conf group-accessible for the soledad group, so the soledad-admin user can read it - Resolves: #7502
Diffstat (limited to 'puppet/modules/soledad/templates')
-rw-r--r--puppet/modules/soledad/templates/soledad-server.conf.erb5
1 files changed, 3 insertions, 2 deletions
diff --git a/puppet/modules/soledad/templates/soledad-server.conf.erb b/puppet/modules/soledad/templates/soledad-server.conf.erb
index 47d1f6e4..42cf44d8 100644
--- a/puppet/modules/soledad/templates/soledad-server.conf.erb
+++ b/puppet/modules/soledad/templates/soledad-server.conf.erb
@@ -1,3 +1,4 @@
[soledad-server]
-couch_url = http://<%= @couchdb_user %>:<%= @couchdb_password %>@<%= @couchdb_host %>:<%= @couchdb_port %>
-
+couch_url = http://<%= @couchdb_user %>:<%= @couchdb_password %>@<%= @couchdb_host %>:<%= @couchdb_port %>
+create_cmd = sudo -u soledad-admin /usr/bin/create-user-db
+admin_netrc = /etc/couchdb/couchdb-soledad-admin.netrc