From ee5edd1f90489ec85ae1b23bbdb038a830825aa6 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Mon, 15 Mar 2021 15:35:07 +0100 Subject: Handle client port that is configured to TLS only The client port can no longer be distributed through the ZK dynamic reconfiguration as the protocol does not support SSL client port. The port must be configured through the static config section instead. --- configdefinitions/src/vespa/zookeeper-server.def | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configdefinitions') diff --git a/configdefinitions/src/vespa/zookeeper-server.def b/configdefinitions/src/vespa/zookeeper-server.def index 536cd993105..006e266916c 100644 --- a/configdefinitions/src/vespa/zookeeper-server.def +++ b/configdefinitions/src/vespa/zookeeper-server.def @@ -16,6 +16,7 @@ maxClientConnections int default=0 dataDir string default="var/zookeeper" clientPort int default=2181 +# TODO(bjorncs): remove setting - no longer in use secureClientPort int default=2184 snapshotCount int default=50000 @@ -42,7 +43,9 @@ server[].joining bool default=false trustEmptySnapshot bool default=true # TLS options +# TODO(bjorncs): todo cleanup after migrating to unified Vespa TLS configuration tlsForQuorumCommunication enum { OFF, PORT_UNIFICATION, TLS_WITH_PORT_UNIFICATION, TLS_ONLY } default=OFF +# TODO(bjorncs): todo cleanup after migrating to unified Vespa TLS configuration 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" -- cgit v1.2.3