summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-08-08 15:11:46 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-08-08 15:11:46 +0200
commit43741ec7f14108bdc1a047ca16df47a6da6ef62a (patch)
tree809df1b01804c161d00a250d3913f63064545db7
parent7510d59aa2871477f2890cf065aa29eb925e1905 (diff)
Remove reference to yca proxy
-rwxr-xr-xconfig-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java2
-rw-r--r--container-search/src/main/resources/configdefinitions/provider.def2
2 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java
index 81eeeea42ee..9796ee91983 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomProviderBuilderTest.java
@@ -80,7 +80,7 @@ public class DomProviderBuilderTest extends DomBuilderTest {
assertThat(providerConfig.yca().applicationId(), is("my-app"));
assertThat(providerConfig.yca().useProxy(), is(true));
- assertThat(providerConfig.yca().host(), is("yca-proxy.corp.yahoo.com")); // default from def-file
+ assertThat(providerConfig.yca().host(), is("yca.host must be set explicitly")); // default from def-file
assertThat(providerConfig.yca().port(), is(3128)); // default from def-file
}
diff --git a/container-search/src/main/resources/configdefinitions/provider.def b/container-search/src/main/resources/configdefinitions/provider.def
index 3cddc085de9..6b23d47427d 100644
--- a/container-search/src/main/resources/configdefinitions/provider.def
+++ b/container-search/src/main/resources/configdefinitions/provider.def
@@ -22,7 +22,7 @@ connectionTimeout double default=-1.0
## in com.yahoo.search.federation.http.HTTPParameters.
connectionPoolTimeout double default=-1.0
## Certificate store proxy host
-yca.host string default="yca-proxy.corp.yahoo.com"
+yca.host string default="yca.host must be set explicitly"
## Certificate store proxy port
yca.port int default=3128
## Whether a proxy is needed (i.e. should the proxy settings be used)