From 8d210c53854e965aec4c0a5964b78ac9dc7c9849 Mon Sep 17 00:00:00 2001 From: Adam Kocoloski Date: Fri, 27 Aug 2010 12:41:29 -0400 Subject: configure ports and node names, also correct a few bugs --- configure | 7 +++++++ rel/overlay/etc/default.ini | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/configure b/configure index d3cd5da5..4f842a07 100755 --- a/configure +++ b/configure @@ -49,6 +49,9 @@ cat > rel/overlay.config << EOF {data_dir, "$DATA"}. {view_dir, "$VIEW"}. {user, "$DBCORE_USER"}. +{node_name, "-name dbcore"}. +{cluster_port, 5984}. +{backend_port, 5986}. EOF cat > install.mk << EOF @@ -64,6 +67,10 @@ for i in 1 2 3; do cat > rel/dev$i.config << EOF {prefix, "$DIRPATH/rel/dev$i"}. {data_dir, "$DIRPATH/rel/tmpdata/dev$i"}. +{view_dir, "$DIRPATH/rel/tmpdata/dev$i"}. +{node_name, "-name dev$i@127.0.0.1"}. +{cluster_port, `expr 10000 \* $i + 5984`}. +{backend_port, `expr 10000 \* $i + 5986`}. EOF done diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini index be65f7bc..da61df26 100644 --- a/rel/overlay/etc/default.ini +++ b/rel/overlay/etc/default.ini @@ -14,12 +14,12 @@ w=2 n=3 [chttpd] -port = 5984 +port = {{cluster_port}} backlog = 512 -docroot = {{prefix}}/var/share/www +docroot = {{prefix}}/share/www [httpd] -port = 5986 +port = {{backend_port}} bind_address = 0.0.0.0 authentication_handlers = {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler} default_handler = {couch_httpd_db, handle_request} @@ -60,9 +60,9 @@ auth_cache={couch_auth_cache, start_link, []} [httpd_global_handlers] / = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome">>} -favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "{{prefix}}/var/share/www"} +favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "{{prefix}}/share/www"} -_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "{{prefix}}/var/share/www"} +_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "{{prefix}}/share/www"} _all_dbs = {couch_httpd_misc_handlers, handle_all_dbs_req} _active_tasks = {couch_httpd_misc_handlers, handle_task_status_req} _config = {couch_httpd_misc_handlers, handle_config_req} -- cgit v1.2.3