diff options
author | Geir Storli <geirstorli@yahoo.no> | 2017-06-14 14:18:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-14 14:18:50 +0200 |
commit | 151865f9c4357895f4a4ccbe41797a0b8a8cc85f (patch) | |
tree | 0bfef12e4a9b7e1c178b68c4ea3e97fd563d1303 | |
parent | 9b3c057ba1f8426cf0e3585f8cf3eb15938ccbfc (diff) | |
parent | 76ef529f53cf81e9e7cff200443686234b9607ab (diff) |
Merge pull request #2767 from yahoo/revert-2750-revert-2727-toregge/rename-filedistribution-programs
Revert "Revert "Rename filedistribution programs to have vespa- prefix.""
-rwxr-xr-x | configserver/src/main/sh/start-filedistribution | 2 | ||||
-rwxr-xr-x | dist/post_install.sh | 4 | ||||
-rw-r--r-- | filedistribution/src/apps/filedistributor/.gitignore | 2 | ||||
-rw-r--r-- | filedistribution/src/apps/filedistributor/CMakeLists.txt | 2 | ||||
-rw-r--r-- | filedistribution/src/apps/status/.gitignore | 2 | ||||
-rw-r--r-- | filedistribution/src/apps/status/CMakeLists.txt | 2 | ||||
-rw-r--r-- | filedistribution/src/apps/status/vespa-status-filedistribution.sh | 2 | ||||
-rw-r--r-- | vespabase/CMakeLists.txt | 2 |
8 files changed, 11 insertions, 7 deletions
diff --git a/configserver/src/main/sh/start-filedistribution b/configserver/src/main/sh/start-filedistribution index ecf04e9e035..df8dce34f13 100755 --- a/configserver/src/main/sh/start-filedistribution +++ b/configserver/src/main/sh/start-filedistribution @@ -78,5 +78,5 @@ if [ "$multitenant" = "true" ]; then export VESPA_LOG_CONTROL_DIR export VESPA_LOG_CONTROL_FILE cd ${ROOT} - vespa-runserver -r 30 -s filedistributor -p $PIDFILE_FILEDISTRIBUTOR -- ${ROOT}/sbin/filedistributor --configid $VESPA_CONFIG_ID + vespa-runserver -r 30 -s filedistributor -p $PIDFILE_FILEDISTRIBUTOR -- ${ROOT}/sbin/vespa-filedistributor --configid $VESPA_CONFIG_ID fi diff --git a/dist/post_install.sh b/dist/post_install.sh index 95f07b76f1c..abbfd55e13f 100755 --- a/dist/post_install.sh +++ b/dist/post_install.sh @@ -69,6 +69,10 @@ ln -s $PREFIX/lib/jars/zkfacade-jar-with-dependencies.jar $INSTALLPATH/conf/conf ln -s $PREFIX/conf/configserver-app/components $INSTALLPATH/lib/jars/config-models ln -s vespa-storaged-bin $INSTALLPATH/sbin/vespa-distributord-bin +# Temporary when renaming programs in filedistribution +ln -s vespa-filedistributor $INSTALLPATH/sbin/filedistributor +ln -s vespa-filedistributor-bin $INSTALLPATH/sbin/filedistributor-bin + # Temporary when renaming binaries in fnet ln -s vespa-rpc-info $INSTALLPATH/bin/rpc_info ln -s vespa-rpc-invoke $INSTALLPATH/bin/rpc_invoke diff --git a/filedistribution/src/apps/filedistributor/.gitignore b/filedistribution/src/apps/filedistributor/.gitignore index a41b1963b70..89aaa70637e 100644 --- a/filedistribution/src/apps/filedistributor/.gitignore +++ b/filedistribution/src/apps/filedistributor/.gitignore @@ -1,2 +1,2 @@ /filedistributor -filedistributor-bin +vespa-filedistributor-bin diff --git a/filedistribution/src/apps/filedistributor/CMakeLists.txt b/filedistribution/src/apps/filedistributor/CMakeLists.txt index 1a7ef87bbac..42e47856208 100644 --- a/filedistribution/src/apps/filedistributor/CMakeLists.txt +++ b/filedistribution/src/apps/filedistributor/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_add_executable(filedistribution_filedistributor_app SOURCES filedistributor.cpp - OUTPUT_NAME filedistributor-bin + OUTPUT_NAME vespa-filedistributor-bin INSTALL sbin DEPENDS filedistribution_distributor diff --git a/filedistribution/src/apps/status/.gitignore b/filedistribution/src/apps/status/.gitignore index 6dc1c1fff5d..2105a3c7051 100644 --- a/filedistribution/src/apps/status/.gitignore +++ b/filedistribution/src/apps/status/.gitignore @@ -1,2 +1,2 @@ -/status-filedistribution +/vespa-status-filedistribution-bin filedistribution_status-filedistribution_app diff --git a/filedistribution/src/apps/status/CMakeLists.txt b/filedistribution/src/apps/status/CMakeLists.txt index 63e9752496e..e46e0c58d86 100644 --- a/filedistribution/src/apps/status/CMakeLists.txt +++ b/filedistribution/src/apps/status/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(filedistribution_status-filedistribution_app SOURCES status-filedistribution.cpp INSTALL bin - OUTPUT_NAME status-filedistribution + OUTPUT_NAME vespa-status-filedistribution-bin DEPENDS filedistribution_filedistributionmodel filedistribution_common diff --git a/filedistribution/src/apps/status/vespa-status-filedistribution.sh b/filedistribution/src/apps/status/vespa-status-filedistribution.sh index 104688a4883..1ba56d6c798 100644 --- a/filedistribution/src/apps/status/vespa-status-filedistribution.sh +++ b/filedistribution/src/apps/status/vespa-status-filedistribution.sh @@ -65,4 +65,4 @@ ROOT=${VESPA_HOME%/} ZKSTRING=$($ROOT/libexec/vespa/vespa-config.pl -zkstring) test -z "$VESPA_LOG_LEVEL" && VESPA_LOG_LEVEL=warning export VESPA_LOG_LEVEL -exec $ROOT/bin/status-filedistribution --zkstring "$ZKSTRING" $@ +exec $ROOT/bin/vespa-status-filedistribution-bin --zkstring "$ZKSTRING" $@ diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index cbd7bd3d334..9c0aced2319 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -11,7 +11,7 @@ vespa_install_script(src/start-cbinaries.sh vespa-transactionlog-inspect bin) vespa_install_script(src/start-cbinaries.sh vespa-vds-disktool bin) vespa_install_script(src/start-cbinaries.sh vespa-distributord sbin) vespa_install_script(src/start-cbinaries.sh vespa-fdispatch sbin) -vespa_install_script(src/start-cbinaries.sh filedistributor sbin) +vespa_install_script(src/start-cbinaries.sh vespa-filedistributor sbin) vespa_install_script(src/start-cbinaries.sh vespa-proton sbin) vespa_install_script(src/start-cbinaries.sh vespa-storaged sbin) |