diff options
| author | Damien F. Katz <damien@apache.org> | 2009-08-04 19:50:46 +0000 |
|---|---|---|
| committer | Damien F. Katz <damien@apache.org> | 2009-08-04 19:50:46 +0000 |
| commit | 8e2215ee6306b0f4c13553796d401e9f5f93bcb6 (patch) | |
| tree | 948b9179887e73379bc445b9ad058de3a0bbe870 /bin | |
| parent | fd72a9bc48ebab76976f538c28459a0e26aa1750 (diff) | |
| download | couchdb-8e2215ee6306b0f4c13553796d401e9f5f93bcb6.tar.gz | |
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 'bin')
| -rw-r--r-- | bin/Makefile.am | 1 | ||||
| -rw-r--r-- | bin/couchdb.tpl.in | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am index 991ceef43..4f7b451e9 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -31,6 +31,7 @@ couchdb: couchdb.tpl -e "s|%couchdbebindir%|couch-@version@/ebin|g" \ -e "s|%mochiwebebindir%|mochiweb-r97/ebin|g" \ -e "s|%ibrowseebindir%|ibrowse-1.4.1/ebin|g" \ + -e "s|%oauthebindir%|erlang-oauth/ebin|g" \ -e "s|%defaultini%|default.ini|g" \ -e "s|%localini%|local.ini|g" \ -e "s|%localconfdir%|@localconfdir@|g" \ diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in index 033acb979..6f22495cf 100644 --- a/bin/couchdb.tpl.in +++ b/bin/couchdb.tpl.in @@ -219,7 +219,9 @@ start_couchdb () { -pa %localerlanglibdir%/%couchdbebindir% \ %localerlanglibdir%/%mochiwebebindir% \ %localerlanglibdir%/%ibrowseebindir% \ + %localerlanglibdir%/%oauthebindir% \ -eval \"application:load(ibrowse)\" \ + -eval \"application:load(oauth)\" \ -eval \"application:load(crypto)\" \ -eval \"application:load(couch)\" \ -eval \"crypto:start()\" \ |