summaryrefslogtreecommitdiffstats
path: root/vespabase
diff options
context:
space:
mode:
authorEirik Nygaard <eirik@ngrd.no>2022-11-07 09:08:39 +0100
committerGitHub <noreply@github.com>2022-11-07 09:08:39 +0100
commit8b901ec4042cd4c6e0813892bfe574df54310e7c (patch)
tree8fd117c69208afeb30a1bcfd04b5228940b9b9d4 /vespabase
parent1268204421c9f9e10ed4e1ce6aaa38cea941d735 (diff)
Revert "Revert "Revert "Move $VESPA_HOME/tmp to $VESPA_HOME/var/tmp [run-systemtest]"""
Diffstat (limited to 'vespabase')
-rw-r--r--vespabase/CMakeLists.txt2
-rwxr-xr-xvespabase/src/rhel-prestart.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt
index e72f02d5eeb..ce19dbb56b3 100644
--- a/vespabase/CMakeLists.txt
+++ b/vespabase/CMakeLists.txt
@@ -23,6 +23,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/conf/default-env.txt DESTINATION conf/
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)
@@ -35,7 +36,6 @@ 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/tmp/vespa)
install(DIRECTORY DESTINATION var/vespa)
install(DIRECTORY DESTINATION var/vespa/application)
install(DIRECTORY DESTINATION var/vespa/bundlecache)
diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh
index 358e9ceccdb..d6f53046b47 100755
--- a/vespabase/src/rhel-prestart.sh
+++ b/vespabase/src/rhel-prestart.sh
@@ -124,6 +124,8 @@ fixdir ${VESPA_USER} ${VESPA_GROUP} 755 logs/vespa
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
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/crash
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db
@@ -139,8 +141,6 @@ fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/search
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/db/vespa/tmp
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/jdisc_container
fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/run
-fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/tmp
-fixdir ${VESPA_USER} ${VESPA_GROUP} 755 var/tmp/vespa
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