diff options
author | Jan Lehnardt <jan@apache.org> | 2019-05-21 10:28:15 +0200 |
---|---|---|
committer | Jan Lehnardt <jan@apache.org> | 2019-05-22 11:43:48 +0200 |
commit | 57bf82e5cc3c3ab55ad6c3e46ea2c666ac2711cc (patch) | |
tree | 3e7db6aa84225abc2698eab2a4ee3f10e1e430ba /dev | |
parent | 04c37fc7b50a311b75fa957d2e615e13214a1df4 (diff) | |
download | couchdb-57bf82e5cc3c3ab55ad6c3e46ea2c666ac2711cc.tar.gz |
feat: move fauxton docroot config to OS env-vars for consistency
Diffstat (limited to 'dev')
-rwxr-xr-x | dev/run | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -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") |