diff options
| -rwxr-xr-x | dist/post_install.sh | 22 | ||||
| -rw-r--r-- | vespabase/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | vespabase/conf/default-env.txt.in | 2 |
3 files changed, 6 insertions, 22 deletions
diff --git a/dist/post_install.sh b/dist/post_install.sh index fb0e19370ee..246fd1a6726 100755 --- a/dist/post_install.sh +++ b/dist/post_install.sh @@ -9,21 +9,6 @@ fi declare -r PREFIX="$1" declare -r INSTALLPATH="$DESTDIR/$PREFIX" -# Rewrite config def file names -for path in $INSTALLPATH/var/db/vespa/config_server/serverdb/classes/*.def; do - dir=$(dirname $path) - filename=$(basename $path) - namespace=$(grep '^ *namespace *=' $path | sed 's/ *namespace *= *//') - if [ "$namespace" ]; then - case $filename in - $namespace.*) - ;; - *) - mv $path $dir/$namespace.$filename ;; - esac - fi -done - mkdir -p $INSTALLPATH/conf/configserver/ mkdir -p $INSTALLPATH/conf/configserver-app/ mkdir -p $INSTALLPATH/conf/configserver-app/config-models/ @@ -67,10 +52,3 @@ ln -sf $PREFIX/lib/jars/zkfacade-jar-with-dependencies.jar $INSTALLPATH/conf/con ln -snf $PREFIX/conf/configserver-app/components $INSTALLPATH/lib/jars/config-models ln -sf vespa-storaged-bin $INSTALLPATH/sbin/vespa-distributord-bin -# Setup default enviroment -mkdir -p $INSTALLPATH/conf/vespa -cat > $INSTALLPATH/conf/vespa/default-env.txt <<EOF -fallback VESPA_HOME $PREFIX -override VESPA_USER vespa -EOF - 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 |