summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-01-15 14:16:26 +0100
committerHarald Musum <musum@oath.com>2018-01-15 14:16:26 +0100
commit75ba2cc21b5c36f95888d3ea58e2b31dd989a088 (patch)
tree422e9e12aa71c7625d8fc4b7c44a21731680921b /configserver
parenta48b0d496c345163bd5657cd240581683ee2e050 (diff)
Make it possible to include config server config in a file
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/resources/configserver-app/services.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index e5a724a07e8..52f63ad398c 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -12,6 +12,7 @@
<accesslog type="vespa" fileNamePattern="logs/vespa/configserver/access.log.%Y%m%d%H%M%S" rotationScheme="date" symlinkName="access.log" />
<preprocess:include file='access-logging.xml' required='false' />
+
<component id="com.yahoo.vespa.config.server.ConfigServerBootstrap" bundle="configserver" />
<component id="com.yahoo.vespa.config.server.monitoring.Metrics" bundle="configserver" />
<component id="com.yahoo.vespa.zookeeper.ZooKeeperServer" bundle="zkfacade" />
@@ -174,5 +175,7 @@
</http>
<preprocess:include file='athenz-identity-provider.xml' required='false' />
+
+ <preprocess:include file='configserver-config.xml' required='false' />
</jdisc>
</services>