summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_httpd.erl
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2008-08-30 14:27:01 +0000
committerJan Lehnardt <jan@apache.org>2008-08-30 14:27:01 +0000
commit3751c13253370c72735fb070588fa8d99db5e81a (patch)
tree650691eddcc992946b87a1c7d4faf41fdfacc2b4 /src/couchdb/couch_httpd.erl
parentbef662fcc96e7b578aac40154e7767de30e9a1c0 (diff)
- Rename configuration options and sections to allow for a nicer .ini file and HTTP API calls.
- Enable .ini parser to read variable assignments with spaces around the '='-sign. - Remove inadequate comment. git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@690513 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_httpd.erl')
-rw-r--r--src/couchdb/couch_httpd.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 1d420ffc..1e5551e6 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -44,9 +44,9 @@ start_link() ->
% just stop if one of the config settings change. couch_server_sup
% will restart us and then we will pick up the new settings.
- BindAddress = couch_config:get({"HTTPd", "BindAddress"}, any),
- Port = couch_config:get({"HTTPd", "Port"}, "5984"),
- DocumentRoot = couch_config:get({"HTTPd", "DocumentRoot"}, "../../share/www"),
+ BindAddress = couch_config:get({"httpd", "bind_address"}, any),
+ Port = couch_config:get({"httpd", "port"}, "5984"),
+ DocumentRoot = couch_config:get({"httpd", "utils_dir"}, "../../share/www"),
% and off we go
Loop = fun (Req) -> apply(couch_httpd, handle_request, [Req, DocumentRoot]) end,
@@ -57,11 +57,11 @@ start_link() ->
{port, Port}
]),
ok = couch_config:register(
- fun({"HTTPd", "BindAddress"}) ->
+ fun({"httpd", "bind_address"}) ->
?MODULE:stop();
- ({"HTTPd", "Port"}) ->
+ ({"httpd", "port"}) ->
?MODULE:stop();
- ({"HTTPd", "DocumentRoot"}) ->
+ ({"httpd", "utils_dir"}) ->
?MODULE:stop()
end, Pid),