summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <bob@rsn.io>2019-12-12 22:54:49 +0000
committerRobert Newson <bob@rsn.io>2019-12-12 23:57:25 +0000
commite37ebde5b0f519fdf3050b78487db6244b5024a3 (patch)
tree264be4f1a998abb8515c9129adfe9490e9c1a2d8
parent0ef71cbba7adc06fe7cf48259aec41e48c3087e2 (diff)
downloadcouchdb-5986-tests-only.tar.gz
Enable port 5986 for test suites only5986-tests-only
-rwxr-xr-xdev/run4
-rw-r--r--rel/files/eunit.ini1
-rw-r--r--rel/overlay/etc/local.ini1
3 files changed, 5 insertions, 1 deletions
diff --git a/dev/run b/dev/run
index 9209c1129..482a0e831 100755
--- a/dev/run
+++ b/dev/run
@@ -400,6 +400,10 @@ def boot_haproxy(ctx):
def hack_default_ini(ctx, node, contents):
+ contents = re.sub(
+ "^\[httpd\]$", "[httpd]\nenable = true", contents, flags=re.MULTILINE,
+ )
+
if ctx["enable_erlang_views"]:
contents = re.sub(
"^\[native_query_servers\]$",
diff --git a/rel/files/eunit.ini b/rel/files/eunit.ini
index 2536a6a5c..361ea6669 100644
--- a/rel/files/eunit.ini
+++ b/rel/files/eunit.ini
@@ -21,6 +21,7 @@ uuid = 74696d6520746f2072656c617821
default_security = everyone
[httpd]
+enable = true
port = 0
[chttpd]
diff --git a/rel/overlay/etc/local.ini b/rel/overlay/etc/local.ini
index 5ccc8269f..2c9e89955 100644
--- a/rel/overlay/etc/local.ini
+++ b/rel/overlay/etc/local.ini
@@ -30,7 +30,6 @@
;socket_options = [{sndbuf, 262144}, {nodelay, true}]
[httpd]
-enable = true ; for the test suites
; NOTE that this only configures the "backend" node-local port, not the
; "frontend" clustered port. You probably don't want to change anything in
; this section.