diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-12-15 15:31:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-15 15:31:56 +0100 |
commit | 76a89eb98d9e5ce63cd7a725d3549c38d0b681e8 (patch) | |
tree | 5767022d30c0bd4de34a6671e514e1e5c7fb6aea /zookeeper-common/src | |
parent | 3a9f89fe60e3420eed435daee435a4f8534c9512 (diff) |
Revert "Jonmv/reapply zk 3.9.1"
Diffstat (limited to 'zookeeper-common/src')
-rw-r--r-- | zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java b/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java deleted file mode 100644 index 78de6c61e17..00000000000 --- a/zookeeper-common/src/main/java/com/yahoo/vespa/zookeeper/tls/VespaZookeeperTlsContextUtils.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.yahoo.vespa.zookeeper.tls; - -import com.yahoo.security.tls.ConfigFileBasedTlsContext; -import com.yahoo.security.tls.TlsContext; -import com.yahoo.security.tls.TransportSecurityUtils; -import com.yahoo.vespa.defaults.Defaults; - -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Optional; - -/** - * @author jonmv - */ -public class VespaZookeeperTlsContextUtils { - - private static final Path ZOOKEEPER_TLS_CONFIG_FILE = Path.of(Defaults.getDefaults().underVespaHome("var/zookeeper/conf/tls.conf.json")); - private static final TlsContext tlsContext = Files.exists(ZOOKEEPER_TLS_CONFIG_FILE) - ? new ConfigFileBasedTlsContext(ZOOKEEPER_TLS_CONFIG_FILE, TransportSecurityUtils.getInsecureAuthorizationMode()) - : TransportSecurityUtils.getSystemTlsContext().orElse(null); - - public static Optional<TlsContext> tlsContext() { - return Optional.ofNullable(tlsContext); - } - -} |