diff options
| author | gjoranv <gv@oath.com> | 2018-09-05 15:09:18 +0200 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:20 +0100 |
| commit | 452678ef3262f788d58f2de596ca569dee1b8680 (patch) | |
| tree | 8fca212d36359acc4e2777290e4e0073d6f1b4fe /container-disc | |
| parent | be89b9f7d9e965c5a46dfedfd110ce3f00d03f18 (diff) | |
Remove legacy config container.jdisc.config.http-server
Diffstat (limited to 'container-disc')
| -rw-r--r-- | container-disc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | container-disc/src/main/resources/configdefinitions/container.jdisc.config.http-server.def | 47 |
2 files changed, 0 insertions, 48 deletions
diff --git a/container-disc/CMakeLists.txt b/container-disc/CMakeLists.txt index 92f5b303d41..edb9dc1ef1b 100644 --- a/container-disc/CMakeLists.txt +++ b/container-disc/CMakeLists.txt @@ -3,7 +3,6 @@ install_fat_java_artifact(container-disc) vespa_install_script(src/main/sh/vespa-start-container-daemon.sh vespa-start-container-daemon bin) -install_config_definition(src/main/resources/configdefinitions/container.jdisc.config.http-server.def) install_config_definition(src/main/resources/configdefinitions/jdisc-bindings.def container.jdisc.jdisc-bindings.def) install_config_definition(src/main/resources/configdefinitions/jersey-connection.def container.config.jersey.jersey-connection.def) install_config_definition(src/main/resources/configdefinitions/jersey-web-app-pool.def container.config.jersey.jersey-web-app-pool.def) diff --git a/container-disc/src/main/resources/configdefinitions/container.jdisc.config.http-server.def b/container-disc/src/main/resources/configdefinitions/container.jdisc.config.http-server.def deleted file mode 100644 index 9275136c585..00000000000 --- a/container-disc/src/main/resources/configdefinitions/container.jdisc.config.http-server.def +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=container.jdisc.config - -# TODO Vespa 7: Remove this config and its adapter in config-model (ConnectorFactory) - -serverName string default="default" -tcpKeepAliveEnabled bool default=false -httpKeepAliveEnabled bool default=true -optimizedForPipeline bool default=false -removeRawPostBodyForWwwUrlEncodedPost bool default=false -responseChunkingEnabled bool default=true -tcpNoDelayEnabled bool default=true -listenPort int -maxChunkSize int default=65536 -maxHeaderSize int default=65536 -maxInitialLineLength int default=65536 -maxUnchunkedResponseSize int default=10362880 -numWorkerThreads int default=16 -receiveBufferSize int default=-1 -responseCompressionLevel int default=6 -sendBufferSize int default=-1 -tcpListenBacklogLength int default=0 -connectTimeout double default=10 -idleConnectionTimeout double default=180 -soLinger double default=-1 -perRequestMetricsEnabled bool default=false -metricUpdateInterval double default=1 -ssl.enabled bool default=false -ssl.keyStoreType string default="JKS" -ssl.keyStorePath string default="default" -ssl.trustStorePath string default="default" -ssl.keyDBKey string default="" -ssl.algorithm string default="SunX509" -ssl.protocol string default="TLS" - -filter[].id string -filter[].binding string - -#copy pasted from new http-server.def(namespace=jdisc.http.server) -accessLog.bufferSize int default = 10240 -accessLog.flushTimeout double default = 5 # seconds -accessLog.fileName string default = "" -accessLog.rotatable bool default = false -accessLog.directory string default = "logs/jdisc_core" -accessLog.prefix string default = "access_log." -accessLog.suffix string default = "" -accessLog.fileDateFormat string default = "yyyy-MM-dd" |