diff options
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | rel/overlay/etc/default.ini | 8 |
2 files changed, 4 insertions, 5 deletions
@@ -43,7 +43,6 @@ done echo "==> configuring dbcore in rel/overlay.config" cat > rel/overlay.config << EOF {prefix, "$PREFIX"}. -{core_dir, "$PREFIX/dbcore"}. {data_dir, "$DATA"}. {view_dir, "$VIEW"}. {user, "$DBCORE_USER"}. diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini index d055217e..feecb61f 100644 --- a/rel/overlay/etc/default.ini +++ b/rel/overlay/etc/default.ini @@ -16,7 +16,7 @@ n=3 [chttpd] port = 5984 backlog = 512 -docroot = {{core_dir}}/var/share/www +docroot = {{prefix}}/var/share/www [httpd] port = 5986 @@ -43,7 +43,7 @@ timeout = 600 ; number of seconds before automatic logout auth_cache_size = 50 ; size is number of cache entries [query_servers] -javascript = {{core_dir}}/bin/couchjs {{core_dir}}/var/share/server/main.js +javascript = {{prefix}}/bin/couchjs {{prefix}}/var/share/server/main.js [query_server_config] reduce_limit = true @@ -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, "{{core_dir}}/var/share/www"} +favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "{{prefix}}/var/share/www"} -_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "{{core_dir}}/var/share/www"} +_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "{{prefix}}/var/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} |