From 9c95241adb5256f45b62f92673bc4cb3b7d4ffe8 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sat, 3 Nov 2012 18:12:43 +0100
Subject: adding couchdb_leap_ca_user + couchdb_leap_web_user

Conflicts:
	provider/services/couchdb.json
---
 provider/services/couchdb.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'provider')

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
-- 
cgit v1.2.3