diff options
| author | kwadronaut <kwadronaut@leap.se> | 2015-11-12 10:00:27 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2015-11-12 10:00:27 +0100 |
| commit | 92cc2b1118e98a4fb086d7c62a140dbfc845f4b0 (patch) | |
| tree | 92896619c0cf4ace177cecfbdea6cbbbb9bc8419 /puppet/modules/soledad/templates/soledad-server.conf.erb | |
| parent | 81467100826ad95266a4c29b11a2ecef759dd782 (diff) | |
| parent | 7d0b6b25e49a1ccb70c4f502f7dfc58878b900cc (diff) | |
Merge remote-tracking branch 'origin/develop' into HEAD
Diffstat (limited to 'puppet/modules/soledad/templates/soledad-server.conf.erb')
| -rw-r--r-- | puppet/modules/soledad/templates/soledad-server.conf.erb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/puppet/modules/soledad/templates/soledad-server.conf.erb b/puppet/modules/soledad/templates/soledad-server.conf.erb index 47d1f6e4..1c6a0d19 100644 --- a/puppet/modules/soledad/templates/soledad-server.conf.erb +++ b/puppet/modules/soledad/templates/soledad-server.conf.erb @@ -1,3 +1,12 @@ [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 + +[database-security] +members = <%= @couchdb_user %>, <%= @couchdb_leap_mx_user %> +# not needed, but for documentation: +# members_roles = replication +# admins = admin +# admins_roles = replication |