summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeir Storli <geirstorli@yahoo.no>2017-06-13 15:09:05 +0200
committerGitHub <noreply@github.com>2017-06-13 15:09:05 +0200
commit68a45a26ae946a0d8bc964fe60df45cc7eae2c20 (patch)
tree87b333b361eeed00b72ab22dd2974e7dbf58c07b
parent758197efcf21dbed789ffbd5dd5d2aa804b3eee1 (diff)
parent81c9974d3572f2613999818150deed7424b6f87f (diff)
Merge pull request #2736 from yahoo/toregge/rename-logserver-programs
Rename logserver programs to have vespa- prefix.
-rwxr-xr-xdist/post_install.sh3
-rw-r--r--install_java.cmake2
2 files changed, 4 insertions, 1 deletions
diff --git a/dist/post_install.sh b/dist/post_install.sh
index 40765357457..abbfd55e13f 100755
--- a/dist/post_install.sh
+++ b/dist/post_install.sh
@@ -151,3 +151,6 @@ ln -s vespa-slobrok-cmd $INSTALLPATH/bin/sbcmd
# Temporary when renaming programs in configd
ln -s vespa-run-as-vespa-user $INSTALLPATH/bin/run-as-yahoo
ln -s vespa-config-sentinel $INSTALLPATH/sbin/config-sentinel
+
+# Temporary when renaming programs in logserver
+ln -s vespa-logserver-start $INSTALLPATH/bin/logserver-start
diff --git a/install_java.cmake b/install_java.cmake
index 00de96a69ad..5b82b16b2e9 100644
--- a/install_java.cmake
+++ b/install_java.cmake
@@ -70,7 +70,7 @@ vespa_install_script(vespaclient-java/src/main/sh/vespa-get.sh vespa-get bin)
vespa_install_script(vespaclient-java/src/main/sh/vespa-visit.sh vespa-visit bin)
vespa_install_script(vespaclient-java/src/main/sh/vespa-visit-target.sh vespa-visit-target bin)
-vespa_install_script(logserver/bin/logserver-start.sh logserver-start bin)
+vespa_install_script(logserver/bin/logserver-start.sh vespa-logserver-start bin)
install(DIRECTORY config-model/src/main/resources/schema DESTINATION share/vespa PATTERN ".gitignore" EXCLUDE)
install(DIRECTORY config-model/src/main/resources/schema DESTINATION share/vespa/schema/version/6.x PATTERN ".gitignore" EXCLUDE)