diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2017-09-27 15:12:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 15:12:41 +0200 |
| commit | bddfb09ab6c2a3504291eca7b74fa0e9d29f79ed (patch) | |
| tree | 9d15d825285f473758722feff18fdb868861030b /vespabase | |
| parent | 34dcac22b79b0e0bce4a3e4108fd2cb99555ddc1 (diff) | |
| parent | 613533f971ebcc4c4f23618439fd28bfc3c2a38b (diff) | |
Merge pull request #3554 from vespa-engine/aressem/remove-post-install-script
Aressem/remove post install script
Diffstat (limited to 'vespabase')
| -rw-r--r-- | vespabase/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | vespabase/conf/default-env.txt.in | 2 | ||||
| -rwxr-xr-x | vespabase/src/rhel-prestart.sh | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index e658a959d84..ea007b130f9 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -31,3 +31,7 @@ configure_file(src/vespa-configserver.service.in src/vespa-configserver.service install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/vespa.service ${CMAKE_CURRENT_BINARY_DIR}/src/vespa-configserver.service DESTINATION etc/systemd/system) 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) + diff --git a/vespabase/conf/default-env.txt.in b/vespabase/conf/default-env.txt.in new file mode 100644 index 00000000000..4855ac9f571 --- /dev/null +++ b/vespabase/conf/default-env.txt.in @@ -0,0 +1,2 @@ +fallback VESPA_HOME @CMAKE_INSTALL_PREFIX@ +override VESPA_USER vespa diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index c00557243a7..37fc5e98533 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -97,6 +97,7 @@ fixdir ${VESPA_USER} wheel 755 var/db/vespa/config_server/serverdb/application fixdir ${VESPA_USER} wheel 755 var/db/vespa/index fixdir ${VESPA_USER} wheel 755 var/db/vespa/logcontrol fixdir ${VESPA_USER} wheel 755 var/db/vespa/search +fixdir ${VESPA_USER} wheel 755 var/jdisc_core fixdir ${VESPA_USER} wheel 755 var/vespa/bundlecache fixdir ${VESPA_USER} wheel 755 var/vespa/bundlecache/configserver fixdir ${VESPA_USER} wheel 755 var/vespa/cache/config/ |