summaryrefslogtreecommitdiff
path: root/dev/run
diff options
context:
space:
mode:
Diffstat (limited to 'dev/run')
-rwxr-xr-xdev/run14
1 files changed, 8 insertions, 6 deletions
diff --git a/dev/run b/dev/run
index fec7d7355..60e7d5c35 100755
--- a/dev/run
+++ b/dev/run
@@ -249,11 +249,6 @@ def check_beams(ctx):
@log("Prepare configuration files")
def setup_configs(ctx):
- if os.path.exists("src/fauxton/dist/release"):
- fauxton_root = "src/fauxton/dist/release"
- else:
- fauxton_root = "share/www"
-
for idx, node in enumerate(ctx["nodes"]):
cluster_port, backend_port = get_ports(ctx, idx + ctx["node_number"])
env = {
@@ -268,7 +263,6 @@ def setup_configs(ctx):
"node_name": "-name %s@127.0.0.1" % node,
"cluster_port": cluster_port,
"backend_port": backend_port,
- "fauxton_root": fauxton_root,
"uuid": "fake_uuid_for_dev",
"_default": "",
}
@@ -530,6 +524,14 @@ def check_node_alive(url):
def set_boot_env(ctx):
+ # fudge fauxton path
+ if os.path.exists("src/fauxton/dist/release"):
+ fauxton_root = "src/fauxton/dist/release"
+ else:
+ fauxton_root = "share/www"
+
+ os.environ["COUCHDB_FAUXTON_DOCROOT"] = fauxton_root
+
# fudge default query server paths
couchjs = os.path.join(ctx["rootdir"], "src", "couch", "priv", "couchjs")
mainjs = os.path.join(ctx["rootdir"], "share", "server", "main.js")