diff options
| author | Eirik Nygaard <eirik.nygaard@yahooinc.com> | 2022-11-04 14:43:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 14:43:26 +0100 |
| commit | 1a9ba093e5358c58765ed1df1a0dcade3c8d7c90 (patch) | |
| tree | 7e5109499dc757de906425047eccd25a4a0fcf04 /configserver | |
| parent | cbacb0648b301d96eeeda98799e1d9f097f90d88 (diff) | |
| parent | 9626751bc6e74104c9791e07a0e666b7c3a9daa7 (diff) | |
Merge pull request #24749 from vespa-engine/hmusum/use-var-dir-for-zookeeper-config
Use var/zookeeper/conf for zookeeper server and client config [run-systemtest]
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt index c2752da57b4..f189dc4f2c1 100644 --- a/configserver/CMakeLists.txt +++ b/configserver/CMakeLists.txt @@ -23,6 +23,6 @@ install_symlink(lib/jars/application-model-jar-with-dependencies.jar conf/config install_symlink(lib/jars/node-repository-jar-with-dependencies.jar conf/configserver-app/components/node-repository.jar) install_symlink(lib/jars/zookeeper-server-jar-with-dependencies.jar conf/configserver-app/components/zookeeper-server.jar) install_symlink(conf/configserver-app/components lib/jars/config-models) -install(DIRECTORY DESTINATION conf/zookeeper) install(DIRECTORY DESTINATION var/zookeeper) +install(DIRECTORY DESTINATION var/zookeeper/conf) install(DIRECTORY DESTINATION logs/vespa/configserver) diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 3fd952f9ac6..97ccae9125f 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -99,9 +99,9 @@ fixddir () { chmod 755 $1 } -fixddir ${VESPA_HOME}/conf/zookeeper -fixfile ${VESPA_HOME}/conf/zookeeper/zookeeper.cfg fixddir ${VESPA_HOME}/var/zookeeper +fixddir ${VESPA_HOME}/var/zookeeper/conf +fixfile ${VESPA_HOME}/var/zookeeper/conf/zookeeper.cfg fixfile ${VESPA_HOME}/var/zookeeper/myid fixddir ${VESPA_HOME}/var/zookeeper/version-2 |