diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2017-09-27 17:16:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 17:16:24 +0200 |
| commit | a06adfa1e3aaaa249b3b9347160657fdb8a431f9 (patch) | |
| tree | 70a28bcc4ad8741cea1b661008c9506f16343e32 /vespabase | |
| parent | 3893d40c4afaadb5112847b6571bf505fe444915 (diff) | |
Revert "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, 0 insertions, 7 deletions
diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index ea007b130f9..e658a959d84 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -31,7 +31,3 @@ 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 deleted file mode 100644 index 4855ac9f571..00000000000 --- a/vespabase/conf/default-env.txt.in +++ /dev/null @@ -1,2 +0,0 @@ -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 37fc5e98533..c00557243a7 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -97,7 +97,6 @@ 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/ |