diff options
| -rw-r--r-- | provider_base/services/soledad.json | 7 | ||||
| -rw-r--r-- | puppet/modules/soledad/manifests/server.pp | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/provider_base/services/soledad.json b/provider_base/services/soledad.json index de24d8ef..b6a0721c 100644 --- a/provider_base/services/soledad.json +++ b/provider_base/services/soledad.json @@ -1,6 +1,7 @@ { - "service_type": "public_service", "soledad": { - "port": 1111 - } + "port": 2424, + "couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]" + }, + "service_type": "public_service" } diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp index 06de8642..a75b4b8a 100644 --- a/puppet/modules/soledad/manifests/server.pp +++ b/puppet/modules/soledad/manifests/server.pp @@ -2,11 +2,11 @@ class soledad::server { tag 'leap_service' include soledad - $couchdb = hiera('couch') + $couchdb = hiera('soledad') $couchdb_host = 'localhost' $couchdb_port = '4096' - $couchdb_user = $couchdb['users']['soledad']['username'] - $couchdb_password = $couchdb['users']['soledad']['password'] + $couchdb_user = $couchdb['couchdb_admin_user']['username'] + $couchdb_password = $couchdb['couchdb_admin_user']['password'] $x509 = hiera('x509') $x509_key = $x509['key'] |