summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Juul <arnej@yahooinc.com>2022-09-09 16:05:31 +0000
committerArne Juul <arnej@yahooinc.com>2022-09-09 16:05:31 +0000
commit6eaa9cb1fdabcf89b400908e60f361b5d323edef (patch)
tree7c91753d1c520a677a383e80f85d6ccc37d77c45
parentfe5aecf15171acec53c3f3e2ff0667c7b7835d0d (diff)
switch to script-utils for security-env
-rwxr-xr-xsecurity-tools/src/main/sh/vespa-curl-wrapper4
-rwxr-xr-xvespaclient/src/sh/vespa-get-cluster-state2
-rwxr-xr-xvespaclient/src/sh/vespa-get-node-state2
-rwxr-xr-xvespaclient/src/sh/vespa-set-node-state2
4 files changed, 5 insertions, 5 deletions
diff --git a/security-tools/src/main/sh/vespa-curl-wrapper b/security-tools/src/main/sh/vespa-curl-wrapper
index 359a22bda20..a6327f3be92 100755
--- a/security-tools/src/main/sh/vespa-curl-wrapper
+++ b/security-tools/src/main/sh/vespa-curl-wrapper
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-# Uses vespa-security-env to call curl with paths to credentials.
+# Uses security-env to call curl with paths to credentials.
# This script should be installed in libexec only. It is not public api.
# BEGIN environment bootstrap section
@@ -79,7 +79,7 @@ findhost
set -e
-eval $($VESPA_HOME/bin/vespa-security-env)
+eval $($VESPA_HOME/libexec/vespa/script-utils security-env)
CURL_PARAMETERS=("$@")
diff --git a/vespaclient/src/sh/vespa-get-cluster-state b/vespaclient/src/sh/vespa-get-cluster-state
index 106254c6e3a..d6e451853de 100755
--- a/vespaclient/src/sh/vespa-get-cluster-state
+++ b/vespaclient/src/sh/vespa-get-cluster-state
@@ -74,6 +74,6 @@ findhost
# END environment bootstrap section
-eval $($VESPA_HOME/bin/vespa-security-env)
+eval $($VESPA_HOME/libexec/vespa/script-utils security-env)
exec $VESPA_HOME/libexec/vespa/GetClusterState.pl "$@"
diff --git a/vespaclient/src/sh/vespa-get-node-state b/vespaclient/src/sh/vespa-get-node-state
index b2b4bdbc864..4021aecf76c 100755
--- a/vespaclient/src/sh/vespa-get-node-state
+++ b/vespaclient/src/sh/vespa-get-node-state
@@ -74,6 +74,6 @@ findhost
# END environment bootstrap section
-eval $($VESPA_HOME/bin/vespa-security-env)
+eval $($VESPA_HOME/libexec/vespa/script-utils security-env)
exec $VESPA_HOME/libexec/vespa/GetNodeState.pl "$@"
diff --git a/vespaclient/src/sh/vespa-set-node-state b/vespaclient/src/sh/vespa-set-node-state
index a1e65984deb..0e19f6b0de0 100755
--- a/vespaclient/src/sh/vespa-set-node-state
+++ b/vespaclient/src/sh/vespa-set-node-state
@@ -74,6 +74,6 @@ findhost
# END environment bootstrap section
-eval $($VESPA_HOME/bin/vespa-security-env)
+eval $($VESPA_HOME/libexec/vespa/script-utils security-env)
exec $VESPA_HOME/libexec/vespa/SetNodeState.pl "$@"