diff options
-rw-r--r-- | dist/vespa.spec | 46 | ||||
-rw-r--r-- | functions.cmake | 4 | ||||
-rw-r--r-- | metrics-proxy/CMakeLists.txt | 2 | ||||
-rw-r--r-- | vespabase/CMakeLists.txt | 23 | ||||
-rwxr-xr-x | vespabase/src/rhel-prestart.sh | 4 |
5 files changed, 58 insertions, 21 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 72a2b58f930..de1b5382040 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -735,8 +735,9 @@ fi %exclude %{_prefix}/conf/configserver-app/components/config-model-fat.jar %exclude %{_prefix}/conf/configserver-app/config-models.xml %dir %{_prefix}/conf/logd +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/conf/telegraf %dir %{_prefix}/conf/vespa -%dir %attr(-,%{_vespa_user},-) %{_prefix}/conf/zookeeper +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/conf/zookeeper %dir %{_prefix}/etc %{_prefix}/etc/systemd %{_prefix}/etc/vespa @@ -779,21 +780,40 @@ fi %exclude %{_prefix}/libexec/vespa/node-admin.sh %exclude %{_prefix}/libexec/vespa/standalone-container.sh %exclude %{_prefix}/libexec/vespa/vespa-curl-wrapper -%dir %attr(1777,-,-) %{_prefix}/logs -%dir %attr(1777,%{_vespa_user},-) %{_prefix}/logs/vespa -%dir %attr(-,%{_vespa_user},-) %{_prefix}/logs/vespa/configserver -%dir %attr(-,%{_vespa_user},-) %{_prefix}/logs/vespa/node-admin -%dir %attr(-,%{_vespa_user},-) %{_prefix}/logs/vespa/search +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs/telegraf +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs/vespa +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs/vespa/access +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs/vespa/configserver +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs/vespa/node-admin +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/logs/vespa/search %{_prefix}/man %{_prefix}/sbin %{_prefix}/share -%dir %attr(1777,-,-) %{_prefix}/tmp -%dir %attr(1777,%{_vespa_user},-) %{_prefix}/tmp/vespa -%dir %{_prefix}/var -%dir %{_prefix}/var/db -%dir %attr(-,%{_vespa_user},-) %{_prefix}/var/db/vespa -%dir %attr(-,%{_vespa_user},-) %{_prefix}/var/db/vespa/logcontrol -%dir %attr(-,%{_vespa_user},-) %{_prefix}/var/zookeeper +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/tmp +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/tmp/vespa +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/crash +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db/vespa +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db/vespa/config_server +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db/vespa/config_server/serverdb +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db/vespa/config_server/serverdb/tenants +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db/vespa/filedistribution +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db/vespa/index +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db/vespa/logcontrol +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db/vespa/search +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/db/vespa/tmp +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/jdisc_container +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/run +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/vespa +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/vespa/application +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/vespa/bundlecache +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/vespa/bundlecache/configserver +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/vespa/cache +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/vespa/cache/config +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/zookeeper +%dir %attr(-,%{_vespa_user},%{_vespa_group}) %{_prefix}/var/zookeeper/version-2 %config(noreplace) %{_prefix}/conf/logd/logd.cfg %if %{_create_vespa_service} %attr(644,root,root) /usr/lib/systemd/system/vespa.service diff --git a/functions.cmake b/functions.cmake index 3721d26d0df..98662d844fc 100644 --- a/functions.cmake +++ b/functions.cmake @@ -749,10 +749,6 @@ function(vespa_detect_build_platform) endif() endfunction() -function(vespa_install_empty_tmp_dir TARGET) -install(DIRECTORY DESTINATION ${TARGET} DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE SETGID) -endfunction() - function(vespa_suppress_warnings_for_protobuf_sources) cmake_parse_arguments( ARG diff --git a/metrics-proxy/CMakeLists.txt b/metrics-proxy/CMakeLists.txt index 5963cba9615..4cc59300058 100644 --- a/metrics-proxy/CMakeLists.txt +++ b/metrics-proxy/CMakeLists.txt @@ -1,6 +1,8 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_jar(metrics-proxy-jar-with-dependencies.jar) +install(DIRECTORY DESTINATION conf/telegraf) +install(DIRECTORY DESTINATION logs/telegraf) vespa_install_script(src/main/sh/start-telegraf.sh libexec/vespa) vespa_install_script(src/main/sh/stop-telegraf.sh libexec/vespa) 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 |