diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | configserver/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | functions.cmake | 4 | ||||
| -rw-r--r-- | node-admin/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | searchcore/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | vespabase/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | vespalog/CMakeLists.txt | 1 |
7 files changed, 16 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 45de080dd1c..a4ef1bdba25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,6 +95,7 @@ add_subdirectory(metrics) add_subdirectory(metrics-proxy) add_subdirectory(model-evaluation) add_subdirectory(model-integration) +add_subdirectory(node-admin) add_subdirectory(node-repository) add_subdirectory(orchestrator) add_subdirectory(persistence) diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt index a2a6df9e017..8e6cfcf8648 100644 --- a/configserver/CMakeLists.txt +++ b/configserver/CMakeLists.txt @@ -8,6 +8,7 @@ vespa_install_script(src/main/sh/stop-configserver libexec/vespa) install(DIRECTORY src/main/resources/logd DESTINATION conf) install(DIRECTORY src/main/resources/configserver-app DESTINATION conf) +install(DIRECTORY DESTINATION conf/configserver) install(DIRECTORY DESTINATION conf/configserver-app/components) install(DIRECTORY DESTINATION conf/configserver-app/config-models) @@ -21,3 +22,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 logs/vespa/configserver) diff --git a/functions.cmake b/functions.cmake index cc8f1c5b038..fc6fbc0b146 100644 --- a/functions.cmake +++ b/functions.cmake @@ -613,3 +613,7 @@ function(vespa_detect_build_platform) message(FATAL_ERROR "-- Could not determine vespa 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() diff --git a/node-admin/CMakeLists.txt b/node-admin/CMakeLists.txt new file mode 100644 index 00000000000..03bf09121c3 --- /dev/null +++ b/node-admin/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install(DIRECTORY DESTINATION logs/vespa/node-admin) diff --git a/searchcore/CMakeLists.txt b/searchcore/CMakeLists.txt index 7dbbb012b11..9c913a4c012 100644 --- a/searchcore/CMakeLists.txt +++ b/searchcore/CMakeLists.txt @@ -151,3 +151,4 @@ vespa_define_module( ) vespa_install_script(src/apps/vespa-remove-indexes/vespa-remove-index.sh vespa-remove-index bin) +install(DIRECTORY DESTINATION logs/vespa/search) diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index 8faf58dd070..ec83e3f567e 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -34,3 +34,6 @@ install(FILES src/Defaults.pm DESTINATION lib/perl5/site_perl/Yahoo/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 var/db/vespa) diff --git a/vespalog/CMakeLists.txt b/vespalog/CMakeLists.txt index a4a97105122..a2f48da0597 100644 --- a/vespalog/CMakeLists.txt +++ b/vespalog/CMakeLists.txt @@ -19,3 +19,4 @@ vespa_define_module( vespa_install_script(src/vespa-logfmt/vespa-logfmt.pl vespa-logfmt bin) install(FILES src/vespa-logfmt/vespa-logfmt.1 DESTINATION man/man1) +install(DIRECTORY DESTINATION var/db/vespa/logcontrol) |