summaryrefslogtreecommitdiff
path: root/provider_base/services
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-06-12 14:47:07 -0400
committerMicah Anderson <micah@riseup.net>2013-06-12 14:47:07 -0400
commit41e09b5aed53948650579547f6fc0a771793f1ae (patch)
tree5bcb1c8a6c7bfe61b2e79168422ea1bca036d632 /provider_base/services
parent086439b2676a763d4414ea3f2ef80fb0daaba088 (diff)
parent8c038fea91adc87adf9e408c16e2f0ec9838e3d2 (diff)
Merge remote-tracking branch 'leap/develop' into develop
Diffstat (limited to 'provider_base/services')
-rw-r--r--provider_base/services/webapp.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 3dd9bebe..ad32bb61 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -2,7 +2,8 @@
"webapp": {
"modules": ["user", "billing", "help"],
"couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]",
- "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:webapp]",
+// "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:webapp]",
+ "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:admin]",
"favicon": "= file_path 'branding/favicon.ico'",
"tail_scss": "= file_path 'branding/tail.scss'",
"head_scss": "= file_path 'branding/head.scss'",