diff options
| author | Morten Tokle <mortent@yahooinc.com> | 2022-08-30 10:13:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 10:13:41 +0200 |
| commit | f68ac5ef5774dfb878e2df010f5257a66b4d6669 (patch) | |
| tree | 6b5e4decc99863b64a0383570cc9c9bdeb09a8f6 /configdefinitions | |
| parent | 880e62e89020c90f0987c624e6b524906f312182 (diff) | |
| parent | 70f97248a925720bea816f64f237349679c792b7 (diff) | |
Merge pull request #23842 from vespa-engine/bjorncs/zk-tls-config
Bjorncs/zk tls config
Diffstat (limited to 'configdefinitions')
| -rw-r--r-- | configdefinitions/src/vespa/zookeeper-server.def | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/configdefinitions/src/vespa/zookeeper-server.def b/configdefinitions/src/vespa/zookeeper-server.def index a2c4ec3b2db..5cff46dd226 100644 --- a/configdefinitions/src/vespa/zookeeper-server.def +++ b/configdefinitions/src/vespa/zookeeper-server.def @@ -16,8 +16,6 @@ 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 # Purge interval in hours @@ -45,13 +43,8 @@ server[].retired bool default=false # TODO: Consider setting this to false by default (and override where appropriate) 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" - dynamicReconfiguration bool default=false snapshotMethod string default="gz" + +# Uses default Vespa mTLS config if empty string +vespaTlsConfigFile string default="" |