[32/37] couchdb commit: updated refs/heads/master to 1ef7182

[ja...@apache.org]

fix fauxton root


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d71b881e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d71b881e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d71b881e

Branch: refs/heads/master
Commit: d71b881e21ca00e7ec58e286924f374b103ff86a
Parents: 4479b72
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Jun 24 22:05:25 2015 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Jun 24 23:07:48 2015 +0200

----------------------------------------------------------------------
 configure                   | 1 +
 rel/overlay/etc/default.ini | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d71b881e/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index da71444..167a75e 100755
--- a/configure
+++ b/configure
@@ -554,6 +554,7 @@ cat > rel/couchdb.config << EOF
 {data_dir, "$DATABASEDIR"}.
 {view_index_dir, "$VIEWDIR"}.
 {log_file, "$LOG_FILE"}.
+{fauxton_root, "$DATAROOTDIR/couchdb/www"}.
 {user, "$COUCHDB_USER"}.
 {node_name, "-name couchdb"}.
 {cluster_port, 5984}.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d71b881e/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 274638d..9e18a32 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -33,7 +33,7 @@ n=3
 [chttpd]
 port = {{cluster_port}}
 backlog = 512
-docroot = {{prefix}}/share/www
+docroot = {{fauxton_root}}
 socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
 
 [database_compaction]