diff options
author | Harald Musum <musum@yahooinc.com> | 2022-11-04 14:20:11 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-11-04 14:20:11 +0100 |
commit | 9626751bc6e74104c9791e07a0e666b7c3a9daa7 (patch) | |
tree | 1528773d644310b28dedf028f7852093b3f64b04 /zookeeper-server | |
parent | 419f93800baa0fdd6e9260f8a9485bb0f2322f0a (diff) |
Use var/zookeeper/conf for zookeeper server and client config
Avoid using read-only conf/ directory for config files written when
starting zookeeper
Diffstat (limited to 'zookeeper-server')
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java index 9a7a79793f3..006a7ce575d 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java @@ -6,8 +6,6 @@ import com.yahoo.security.tls.ConfigFileBasedTlsContext; import com.yahoo.security.tls.MixedMode; import com.yahoo.security.tls.TlsContext; import com.yahoo.security.tls.TransportSecurityUtils; -import com.yahoo.vespa.defaults.Defaults; - import java.io.FileWriter; import java.io.IOException; import java.nio.file.Path; @@ -161,10 +159,7 @@ public class Configurator { Path makeAbsolutePath(String filename) { Path path = Paths.get(filename); - if (path.isAbsolute()) - return path; - else - return Paths.get(getDefaults().underVespaHome(filename)); + return path.isAbsolute() ? path : Paths.get(getDefaults().underVespaHome(filename)); } private interface TlsConfig { |