summaryrefslogtreecommitdiffstats
path: root/vespabase
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2022-06-20 13:05:52 +0200
committerTor Egge <Tor.Egge@online.no>2022-06-20 13:05:52 +0200
commit14d88ef46260fe27741ffd86335e44d7dad4cf03 (patch)
tree25a5910ce94bc82ee7602c0cd174eff2dcc7813c /vespabase
parent6fbf962ae13e6eb45a358017229949778ed08a85 (diff)
Sync initial directory permissions and ownership with fixdir settings
from vespa-prestart.sh, fixddir settings from start-configserver and start-telegraf.sh and FixDataDirectory settings from standalone-container.sh.
Diffstat (limited to 'vespabase')
-rw-r--r--vespabase/CMakeLists.txt23
-rwxr-xr-xvespabase/src/rhel-prestart.sh4
2 files changed, 23 insertions, 4 deletions
diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt
index c80f22fdb38..613215c46d3 100644
--- a/vespabase/CMakeLists.txt
+++ b/vespabase/CMakeLists.txt
@@ -35,6 +35,25 @@ install(FILES conf/java.security.override DESTINATION conf/vespa)
configure_file(conf/default-env.txt.in conf/default-env.txt @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/conf/default-env.txt DESTINATION conf/vespa)
-vespa_install_empty_tmp_dir(logs/vespa)
-vespa_install_empty_tmp_dir(tmp/vespa)
+install(DIRECTORY DESTINATION logs/vespa)
+install(DIRECTORY DESTINATION logs/vespa/access)
+install(DIRECTORY DESTINATION tmp/vespa)
+install(DIRECTORY DESTINATION var/crash)
install(DIRECTORY DESTINATION var/db/vespa)
+install(DIRECTORY DESTINATION var/db/vespa/config_server)
+install(DIRECTORY DESTINATION var/db/vespa/config_server/serverdb)
+install(DIRECTORY DESTINATION var/db/vespa/config_server/serverdb/tenants)
+install(DIRECTORY DESTINATION var/db/vespa/filedistribution)
+install(DIRECTORY DESTINATION var/db/vespa/index)
+install(DIRECTORY DESTINATION var/db/vespa/search)
+install(DIRECTORY DESTINATION var/db/vespa/tmp)
+install(DIRECTORY DESTINATION var/jdisc_container)
+install(DIRECTORY DESTINATION var/run)
+install(DIRECTORY DESTINATION var/vespa)
+install(DIRECTORY DESTINATION var/vespa/application)
+install(DIRECTORY DESTINATION var/vespa/bundlecache)
+install(DIRECTORY DESTINATION var/vespa/bundlecache/configserver)
+install(DIRECTORY DESTINATION var/vespa/cache)
+install(DIRECTORY DESTINATION var/vespa/cache/config)
+install(DIRECTORY DESTINATION var/zookeeper)
+install(DIRECTORY DESTINATION var/zookeeper/version-2)
diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh
index a4d0ad415fa..e6fafd9a7a0 100755
--- a/vespabase/src/rhel-prestart.sh
+++ b/vespabase/src/rhel-prestart.sh
@@ -101,8 +101,8 @@ fixdir () {
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa
-fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa/configserver
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa/access
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa/configserver
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa/search
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 tmp
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 tmp/vespa
@@ -123,7 +123,7 @@ fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/application
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/bundlecache
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/bundlecache/configserver
-fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/cache/config/
+fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/vespa/cache/config
if [ "${VESPA_UNPRIVILEGED}" != yes ]; then
chown -hR ${VESPA_USER} logs/vespa