diff options
| author | elijah <elijah@riseup.net> | 2012-11-04 13:14:03 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2012-11-04 13:14:03 -0800 |
| commit | 809cb70a4d9e7b9840f20732ccb632c02d3f969c (patch) | |
| tree | 8105fba5c7f2b38384ee1396c55a3bacc5984a6f | |
| parent | 8968c6e02641ccd60a3bec4c4b680061e5d4b77f (diff) | |
added couchdb users
| -rw-r--r-- | provider/secrets.json | 5 | ||||
| -rw-r--r-- | provider/services/couchdb.json | 23 | ||||
| -rw-r--r-- | provider/services/webapp.json | 3 |
3 files changed, 22 insertions, 9 deletions
diff --git a/provider/secrets.json b/provider/secrets.json new file mode 100644 index 0000000..469a35f --- /dev/null +++ b/provider/secrets.json @@ -0,0 +1,5 @@ +{ + "couch_admin_password": "cXzZe8@&QW5sj3~4qSdt97bdQjMQMTT3", + "couch_ca_daemon_password": "CcMF5a2wvAIPAQKWTk+3mYqmg~KS%LyZ", + "couch_webapp_password": "+vqCKG&7A%wDt&Ka-4=uwn5ZhTt6HVKU" +} diff --git a/provider/services/couchdb.json b/provider/services/couchdb.json index d0fe97f..1c8005c 100644 --- a/provider/services/couchdb.json +++ b/provider/services/couchdb.json @@ -3,13 +3,20 @@ "x509": { "use": true }, - "couchdb_adminpw": "mahz2Oow", - "couchdb_leap_web_user": { - "user": "leap_web", - "pw": "chue3auN" - }, - "couchdb_leap_ca_user": { - "user": "leap_ca", - "pw": "Eibe2rae" + "couch": { + "users": { + "admin": { + "username": "admin", + "password": "= secret :couch_admin_password" + }, + "webapp": { + "username": "webapp", + "password": "= secret :couch_webapp_password" + }, + "ca_daemon": { + "username": "ca_daemon", + "password": "= secret :couch_ca_daemon_password" + } + } } } diff --git a/provider/services/webapp.json b/provider/services/webapp.json index 0e5b2f9..a997dc1 100644 --- a/provider/services/webapp.json +++ b/provider/services/webapp.json @@ -1,7 +1,8 @@ { "webapp": { "modules": ["user", "billing", "help"], - "couchdb_hosts": "= nodes[:services => :couchdb].field('domain.name')" + "couchdb_hosts": "= nodes[:services => :couchdb].field('domain.name')", + "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]" }, "definition_files": { "provider": "= file('service-definitions/provider.json.erb')", |