Use var/zookeeper/conf for zookeeper server and client config

Avoid using read-only conf/ directory for config files written when
starting zookeeper

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 {