diff options
author | varac <varacanero@zeromail.org> | 2013-03-12 14:33:24 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-03-12 14:33:24 +0100 |
commit | 3633f137c99a4fcb647cb098ee01704ff3f7554c (patch) | |
tree | 7e7a2334149f12f42725b4d9a549034a18142b8b /puppet/modules/site_couchdb/files/local.ini | |
parent | 0ffc583488ee044be30ea5bf7fae751505419a9b (diff) | |
parent | 01941d905a71a2088ec080703f4e5430dec7a2ec (diff) |
Merge branch 'feature/bigcouch' into develop
Conflicts:
provider_base/services/couchdb.json
Diffstat (limited to 'puppet/modules/site_couchdb/files/local.ini')
-rw-r--r-- | puppet/modules/site_couchdb/files/local.ini | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/modules/site_couchdb/files/local.ini b/puppet/modules/site_couchdb/files/local.ini index b3376cbb..22aa0177 100644 --- a/puppet/modules/site_couchdb/files/local.ini +++ b/puppet/modules/site_couchdb/files/local.ini @@ -28,8 +28,10 @@ [httpd_global_handlers] ;_google = {couch_httpd_proxy, handle_proxy_req, <<"http://www.google.com">>} +# futon is enabled by default on bigcouch in default.ini +# we need to find another way to disable futon, it won't work disabling it here # enable futon -_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "/usr/share/couchdb/www"} +#_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!">>} |