diff options
| author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-06-13 09:17:05 +0000 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-06-13 09:17:05 +0000 |
| commit | 9212b86108683e9f9db1dac6697b911fc61569a0 (patch) | |
| tree | 9a7632b278c6d19d8952f0f930d2f98da6538b06 /configd | |
| parent | 9fe6a9f635a5277d6d6c58ccbe5b279449e016c1 (diff) | |
Rename configd programs to have vespa- prefix.
Temporarily add symlinks from old name to new name.
Diffstat (limited to 'configd')
| -rw-r--r-- | configd/src/apps/sentinel/.gitignore | 2 | ||||
| -rw-r--r-- | configd/src/apps/sentinel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | configd/src/apps/su/.gitignore | 2 | ||||
| -rw-r--r-- | configd/src/apps/su/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | configd/src/apps/su/main.cpp | 2 | ||||
| -rwxr-xr-x | configd/src/tests/configd/run-sentinel.sh | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/configd/src/apps/sentinel/.gitignore b/configd/src/apps/sentinel/.gitignore index bc87d9cebdc..b299012f583 100644 --- a/configd/src/apps/sentinel/.gitignore +++ b/configd/src/apps/sentinel/.gitignore @@ -1,3 +1,3 @@ .depend Makefile -config-sentinel +vespa-config-sentinel diff --git a/configd/src/apps/sentinel/CMakeLists.txt b/configd/src/apps/sentinel/CMakeLists.txt index 5f20042c021..ea25156a3c4 100644 --- a/configd/src/apps/sentinel/CMakeLists.txt +++ b/configd/src/apps/sentinel/CMakeLists.txt @@ -9,7 +9,7 @@ vespa_add_executable(configd_config-sentinel_app output-connection.cpp metrics.cpp state-api.cpp - OUTPUT_NAME config-sentinel + OUTPUT_NAME vespa-config-sentinel INSTALL sbin DEPENDS configdefinitions diff --git a/configd/src/apps/su/.gitignore b/configd/src/apps/su/.gitignore index 343f531c8c1..cda22958555 100644 --- a/configd/src/apps/su/.gitignore +++ b/configd/src/apps/su/.gitignore @@ -1,3 +1,3 @@ /.depend /Makefile -/run-as-yahoo +/vespa-run-as-vespa-user diff --git a/configd/src/apps/su/CMakeLists.txt b/configd/src/apps/su/CMakeLists.txt index 8883fe2344f..72502e9dc5e 100644 --- a/configd/src/apps/su/CMakeLists.txt +++ b/configd/src/apps/su/CMakeLists.txt @@ -1,8 +1,8 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(configd_run-as-yahoo_app +vespa_add_executable(configd_vespa-run-as-vespa-user_app SOURCES main.cpp - OUTPUT_NAME run-as-yahoo + OUTPUT_NAME vespa-run-as-vespa-user INSTALL bin DEPENDS ) diff --git a/configd/src/apps/su/main.cpp b/configd/src/apps/su/main.cpp index e6252e483cb..ab6cd919138 100644 --- a/configd/src/apps/su/main.cpp +++ b/configd/src/apps/su/main.cpp @@ -13,7 +13,7 @@ int main(int argc, char** argv) { if (argc < 2) { - fprintf(stderr, "missing arguments, usage: run-as-yahoo <cmd> [args ...]\n"); + fprintf(stderr, "missing arguments, usage: vespa-run-as-vespa-user <cmd> [args ...]\n"); exit(1); } const char *username = getenv("VESPA_USER"); diff --git a/configd/src/tests/configd/run-sentinel.sh b/configd/src/tests/configd/run-sentinel.sh index 0a0f8e80bf2..e257a41c829 100755 --- a/configd/src/tests/configd/run-sentinel.sh +++ b/configd/src/tests/configd/run-sentinel.sh @@ -2,7 +2,7 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. set -e -if ../../apps/sentinel/config-sentinel > tmp.log 2>&1 ; then +if ../../apps/sentinel/vespa-config-sentinel > tmp.log 2>&1 ; then echo "Should need argument" exit 1 fi |