summaryrefslogtreecommitdiffstats
path: root/configdefinitions/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-03-12 15:10:57 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-03-12 15:10:57 +0100
commit02b31925778bd85d0002257ea893cc08e10042e1 (patch)
tree8da18b5fc934047d133696e385ff2c6315250fc3 /configdefinitions/src
parent5fc288ac15612f400879f7278d588541fe8257a4 (diff)
Use SSLContext supplier for ZK server configuration
Remove use of keystore/truststore from disk. Only configure client secure port if TLS is enabled.
Diffstat (limited to 'configdefinitions/src')
-rw-r--r--configdefinitions/src/vespa/zookeeper-server.def1
1 files changed, 1 insertions, 0 deletions
diff --git a/configdefinitions/src/vespa/zookeeper-server.def b/configdefinitions/src/vespa/zookeeper-server.def
index 39785afd681..536cd993105 100644
--- a/configdefinitions/src/vespa/zookeeper-server.def
+++ b/configdefinitions/src/vespa/zookeeper-server.def
@@ -44,6 +44,7 @@ trustEmptySnapshot bool default=true
# TLS options
tlsForQuorumCommunication enum { OFF, PORT_UNIFICATION, TLS_WITH_PORT_UNIFICATION, TLS_ONLY } default=OFF
tlsForClientServerCommunication enum { OFF, PORT_UNIFICATION, TLS_WITH_PORT_UNIFICATION, TLS_ONLY } default=OFF
+# TODO(bjorncs): remove setting - no longer in use
jksKeyStoreFile string default="conf/zookeeper/zookeeper.jks"
dynamicReconfiguration bool default=false