diff options
| author | John Christopher Anderson <jchris@apache.org> | 2010-01-07 20:02:46 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2010-01-07 20:02:46 +0000 |
| commit | cd0e9c9b6384e4c9200d10088a13164ce4229ea6 (patch) | |
| tree | 0ac40098a49b2dd62b0099f742323a7811399489 /etc | |
| parent | dd15c8ed5bf5873aec08a99a0687849f1d29f4c3 (diff) | |
merge account branch to trunk
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@896989 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/couchdb/default.ini.tpl.in | 5 | ||||
| -rw-r--r-- | etc/couchdb/local.ini | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index 71656d26..409bfe98 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -17,9 +17,8 @@ batch_save_interval = 1000 ; milliseconds after which to save batches [httpd] port = 5984 bind_address = 127.0.0.1 -authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, default_authentication_handler} +authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler} default_handler = {couch_httpd_db, handle_request} -WWW-Authenticate = Basic realm="administrator" [log] file = %localstatelogdir%/couch.log @@ -27,7 +26,6 @@ level = info [couch_httpd_auth] authentication_db = users -secret = replace this with a real secret in your local.ini file require_valid_user = false [query_servers] @@ -70,7 +68,6 @@ _log = {couch_httpd_misc_handlers, handle_log_req} _sleep = {couch_httpd_misc_handlers, handle_sleep_req} _session = {couch_httpd_auth, handle_session_req} _oauth = {couch_httpd_oauth, handle_oauth_req} -_user = {couch_httpd_auth, handle_user_req} [httpd_db_handlers] _view_cleanup = {couch_httpd_db, handle_view_cleanup_req} diff --git a/etc/couchdb/local.ini b/etc/couchdb/local.ini index 0a118770..96fcdc76 100644 --- a/etc/couchdb/local.ini +++ b/etc/couchdb/local.ini @@ -10,14 +10,12 @@ [httpd] ;port = 5984 ;bind_address = 127.0.0.1 +; Uncomment next line to trigger basic-auth popup on unauthorized requests. +;WWW-Authenticate = Basic realm="administrator" [log] ;level = debug -[couch_httpd_auth] -;secret = replace this with a real secret - - [update_notification] ;unique notifier name=/full/path/to/exe -with "cmd line arg" |