summaryrefslogtreecommitdiff
path: root/puppet/modules/site_couchdb
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-02-12 11:14:32 -0500
committerMicah Anderson <micah@riseup.net>2013-02-12 11:14:32 -0500
commit05b4a4d9d6ddb594ffa900192ad0ad714957663f (patch)
tree2a24f3b6ecf55e8f8265cf7b9aa0e86c5563638b /puppet/modules/site_couchdb
parent1a2789d084c3c2beccb97726b8799cb194a634fd (diff)
parent102af94df02decef888bac09748dbac6773dedd6 (diff)
Merge remote-tracking branch 'origin/develop' into bundle-and-precompile-as-user
Diffstat (limited to 'puppet/modules/site_couchdb')
-rw-r--r--puppet/modules/site_couchdb/files/local.ini6
1 files changed, 5 insertions, 1 deletions
diff --git a/puppet/modules/site_couchdb/files/local.ini b/puppet/modules/site_couchdb/files/local.ini
index 4003bfcd..b3376cbb 100644
--- a/puppet/modules/site_couchdb/files/local.ini
+++ b/puppet/modules/site_couchdb/files/local.ini
@@ -27,7 +27,11 @@
[httpd_global_handlers]
;_google = {couch_httpd_proxy, handle_proxy_req, <<"http://www.google.com">>}
-_utils = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome, Futon is disabled!">>}
+
+# enable futon
+_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "/usr/share/couchdb/www"}
+# disable futon
+#_utils = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome, Futon is disabled!">>}
[couch_httpd_auth]
; If you set this to true, you should also uncomment the WWW-Authenticate line