diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2018-01-15 15:23:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 15:23:22 +0100 |
| commit | c63b41017571d59c39471f93fa66f143ba2b0663 (patch) | |
| tree | 23f7ad723439f54fed9a9cb7eb65edf1eff76c67 /configserver | |
| parent | 0b3d312ee0e62df746d4a5ab8b567d6e6506ccb3 (diff) | |
| parent | 75ba2cc21b5c36f95888d3ea58e2b31dd989a088 (diff) | |
Merge pull request #4661 from vespa-engine/hmusum/include-configserver-config-file
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.xml | 3 |
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> |