diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-09-26 14:18:53 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-09-26 14:18:53 +0200 |
| commit | 471ca26b077dc4d9b8d709f51071e8fe66347540 (patch) | |
| tree | 58d3706f6f980e16bc8d4517e03ece922ab41f1c /vespabase | |
| parent | c3a3e10868099709b46f4068967e0d4624d33abc (diff) | |
Get rid of config file in post install.
Diffstat (limited to 'vespabase')
| -rw-r--r-- | vespabase/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | vespabase/conf/default-env.txt.in | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index e658a959d84..af0dda6fa82 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 $ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/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 |