summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorDamien F. Katz <damien@apache.org>2009-08-04 19:50:46 +0000
committerDamien F. Katz <damien@apache.org>2009-08-04 19:50:46 +0000
commit8e2215ee6306b0f4c13553796d401e9f5f93bcb6 (patch)
tree948b9179887e73379bc445b9ad058de3a0bbe870 /etc
parentfd72a9bc48ebab76976f538c28459a0e26aa1750 (diff)
Initial check-in of OAuth and cookie authentication.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@800938 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'etc')
-rw-r--r--etc/couchdb/default.ini.tpl.in11
-rw-r--r--etc/couchdb/local.ini4
2 files changed, 13 insertions, 2 deletions
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index 77a09fcb..68373691 100644
--- a/etc/couchdb/default.ini.tpl.in
+++ b/etc/couchdb/default.ini.tpl.in
@@ -16,7 +16,7 @@ batch_save_interval = 1000 ; milliseconds after which to save batches
[httpd]
port = 5984
bind_address = 127.0.0.1
-authentication_handler = {couch_httpd, default_authentication_handler}
+authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, default_authentication_handler}
default_handler = {couch_httpd_db, handle_request}
WWW-Authenticate = Basic realm="administrator"
@@ -24,6 +24,11 @@ WWW-Authenticate = Basic realm="administrator"
file = %localstatelogdir%/couch.log
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]
javascript = %bindir%/%couchjs_command_name% %localdatadir%/server/main.js
@@ -62,7 +67,9 @@ _restart = {couch_httpd_misc_handlers, handle_restart_req}
_stats = {couch_httpd_stats_handlers, handle_stats_req}
_log = {couch_httpd_misc_handlers, handle_log_req}
_sleep = {couch_httpd_misc_handlers, handle_sleep_req}
-_whoami = {couch_httpd_misc_handlers, handle_whoami_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 f2dbc4fb..c7027415 100644
--- a/etc/couchdb/local.ini
+++ b/etc/couchdb/local.ini
@@ -14,6 +14,10 @@
[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"