diff options
| author | Eirik Nygaard <eirik@ngrd.no> | 2022-11-07 09:10:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-07 09:10:40 +0100 |
| commit | 24138b41c3cc7ba82f33139faf2ed6eb985bf5d5 (patch) | |
| tree | 2467858501846bfb880a32048a85b15a9d0ef17f /vespabase | |
| parent | a2eca5f54c45838d072f9641505baa3ae0d26746 (diff) | |
Revert "Revert "Revert "Revert "Move $VESPA_HOME/tmp to $VESPA_HOME/var/tmp [run-systemtest]""""
Diffstat (limited to 'vespabase')
| -rw-r--r-- | vespabase/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | vespabase/src/rhel-prestart.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index ce19dbb56b3..e72f02d5eeb 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -23,7 +23,6 @@ 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) @@ -36,6 +35,7 @@ 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 d6f53046b47..358e9ceccdb 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -124,8 +124,6 @@ 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 @@ -141,6 +139,8 @@ 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 |