diff options
| author | varac <varacanero@zeromail.org> | 2015-10-05 13:44:32 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-10-05 13:44:32 +0200 |
| commit | afddd1bfb3cd8d68bdc699c983fdcd54561c44bd (patch) | |
| tree | d4dd9807467d90316a52c4596c2b33421e439b16 /puppet/modules/soledad/templates | |
| parent | 03528deb5aab7311a90b07aec77e0805a233d154 (diff) | |
| parent | 4fc7419598a3baf564f063b7330b9cf9115420b5 (diff) | |
Merge branch 'soledad_userdb_creation' into develop
Diffstat (limited to 'puppet/modules/soledad/templates')
| -rw-r--r-- | puppet/modules/soledad/templates/soledad-server.conf.erb | 5 |
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 |