summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDamien F. Katz <damien@apache.org>2008-04-20 22:27:11 +0000
committerDamien F. Katz <damien@apache.org>2008-04-20 22:27:11 +0000
commit7cbf6068b8214a89b75e3aa26bdb10d22e97ab90 (patch)
treeb9fe23fd3c699fd188fb29cc966864e7c730f9b3 /bin
parentfb5b6bbc5aa941478d700e8fb3011c2a24c4d2d4 (diff)
Change uuid generaion to rely on crypto. Started crypto and inets application in startscript, and also couch_server_up. Fix for regression caused by accidental check-in of disabled etags.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@649988 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'bin')
-rw-r--r--bin/couchdb.tpl.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index 429508ba..4002b006 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -224,7 +224,11 @@ start_couchdb () {
%ERL% $interactive_option -sasl errlog_type error \
-pa %erlanglibdir%/couch-%version%/ebin \
%erlanglibdir%/mochiweb-r64/ebin \
+ -eval \"application:load(inets)\" \
+ -eval \"application:load(crypto)\" \
-eval \"application:load(couch)\" \
+ -eval \"crypto:start()\" \
+ -eval \"inets:start()\" \
-eval \"couch_server:start(), receive done -> done end.\" \
-couchini $INI_FILE"
if test "$BACKGROUND_BOOLEAN" = "true" \