diff options
| author | varac <varacanero@zeromail.org> | 2012-11-03 18:12:43 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-11-03 21:54:07 +0100 |
| commit | 9c95241adb5256f45b62f92673bc4cb3b7d4ffe8 (patch) | |
| tree | 4d3d3c1e12e15ebbaf504335c0dc9a0c8121b54c | |
| parent | 3479a824b8361e40acae7c90be62e8d26f73da76 (diff) | |
adding couchdb_leap_ca_user + couchdb_leap_web_user
Conflicts:
provider/services/couchdb.json
| -rw-r--r-- | provider/services/couchdb.json | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/provider/services/couchdb.json b/provider/services/couchdb.json index 850af3d..52b5372 100644 --- a/provider/services/couchdb.json +++ b/provider/services/couchdb.json @@ -2,5 +2,15 @@ "service_type": "internal_service", "x509": { "use": true + }, + "couchdb_adminpw": "mahz2Oow", + "couchdb_leap_web_user": { + "user": "leap_web", + "pw": "chue3auN" + }, + "couchdb_leap_ca_user": { + "user": "leap_ca", + "pw": "Eibe2rae" } -}
\ No newline at end of file +} +>>>>>>> e0f03d9... adding couchdb_leap_ca_user + couchdb_leap_web_user |