summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2020-01-15 16:12:19 +0100
committerGitHub <noreply@github.com>2020-01-15 16:12:19 +0100
commit54f9f5a01ee741c88512dca5286a0f54e087a02a (patch)
tree9f7490fdff183eb81125fb3de2b3781bde1c9201 /configserver
parent3a789e470822142d2a980985182a6c693ac5099d (diff)
parent566bd79f9881461dfccc24e41bffa317640da75c (diff)
Merge pull request #11792 from vespa-engine/bratseth/dont-allow-wrong-webserviceport
Fail deployment if the wrong web service port is configured
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/test/apps/hosted-no-write-access-control/services.xml2
-rw-r--r--configserver/src/test/apps/hosted-routing-app/services.xml2
-rw-r--r--configserver/src/test/apps/hosted/services.xml2
-rw-r--r--configserver/src/test/apps/validationOverride/services.xml2
4 files changed, 4 insertions, 4 deletions
diff --git a/configserver/src/test/apps/hosted-no-write-access-control/services.xml b/configserver/src/test/apps/hosted-no-write-access-control/services.xml
index e3262f6eeec..b12f630ef80 100644
--- a/configserver/src/test/apps/hosted-no-write-access-control/services.xml
+++ b/configserver/src/test/apps/hosted-no-write-access-control/services.xml
@@ -8,7 +8,7 @@
<container version="1.0">
<http>
- <server id="foo" port="4080" />
+ <server id="foo"/>
</http>
<search/>
<nodes count='1'/>
diff --git a/configserver/src/test/apps/hosted-routing-app/services.xml b/configserver/src/test/apps/hosted-routing-app/services.xml
index 7eaf810ad25..603d6d97ec8 100644
--- a/configserver/src/test/apps/hosted-routing-app/services.xml
+++ b/configserver/src/test/apps/hosted-routing-app/services.xml
@@ -11,7 +11,7 @@
<filtering>
<access-control domain="foo" write="true" />
</filtering>
- <server id="foo" port="4080" />
+ <server id="foo"/>
</http>
<search/>
<nodes type='host'/>
diff --git a/configserver/src/test/apps/hosted/services.xml b/configserver/src/test/apps/hosted/services.xml
index d84718cf141..a5d2aae8de9 100644
--- a/configserver/src/test/apps/hosted/services.xml
+++ b/configserver/src/test/apps/hosted/services.xml
@@ -11,7 +11,7 @@
<filtering>
<access-control domain="foo" write="true" />
</filtering>
- <server id="foo" port="4080" />
+ <server id="foo"/>
</http>
<search/>
<nodes count='1'/>
diff --git a/configserver/src/test/apps/validationOverride/services.xml b/configserver/src/test/apps/validationOverride/services.xml
index bec088d3922..42a1a68ccdb 100644
--- a/configserver/src/test/apps/validationOverride/services.xml
+++ b/configserver/src/test/apps/validationOverride/services.xml
@@ -4,7 +4,7 @@
<filtering>
<access-control domain="foo" write="true" />
</filtering>
- <server id="foo" port="4080" />
+ <server id="foo"/>
</http>
<search/>
<nodes count="2"/>