Introduce wrapper script sourcing vespa-security-end

4 files changed, 22 insertions, 3 deletions

diff --git a/vespaclient/CMakeLists.txt b/vespaclient/CMakeLists.txt
index 8be8751f2c9..b0f4b2190f9 100644
--- a/vespaclient/CMakeLists.txt
+++ b/vespaclient/CMakeLists.txt
@@ -19,9 +19,13 @@ vespa_define_module(
     src/vespa/vespaclient/vesparoute
 )
 
-vespa_install_script(src/perl/bin/SetNodeState.pl vespa-set-node-state bin)
-vespa_install_script(src/perl/bin/GetNodeState.pl vespa-get-node-state bin)
-vespa_install_script(src/perl/bin/GetClusterState.pl vespa-get-cluster-state bin)
+vespa_install_script(src/sh/vespa-set-node-state vespa-set-node-state bin)
+vespa_install_script(src/sh/vespa-get-node-state vespa-get-node-state bin)
+vespa_install_script(src/sh/vespa-get-cluster-state vespa-get-cluster-state bin)
+
+vespa_install_script(src/perl/bin/SetNodeState.pl libexec/vespa)
+vespa_install_script(src/perl/bin/GetNodeState.pl libexec/vespa)
+vespa_install_script(src/perl/bin/GetClusterState.pl libexec/vespa)
 
 install(DIRECTORY src/perl/lib/Yahoo/Vespa/
         DESTINATION lib/perl5/site_perl/Yahoo/Vespa
diff --git a/vespaclient/src/sh/vespa-get-cluster-state b/vespaclient/src/sh/vespa-get-cluster-state
new file mode 100755
index 00000000000..a71a8a73abf
--- /dev/null
+++ b/vespaclient/src/sh/vespa-get-cluster-state
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+eval $(vespa-security-env)
+
+$VESPA_HOME/libexec/vespa/GetClusterState.pl "$@"
\ No newline at end of file
diff --git a/vespaclient/src/sh/vespa-get-node-state b/vespaclient/src/sh/vespa-get-node-state
new file mode 100755
index 00000000000..57709f3923a
--- /dev/null
+++ b/vespaclient/src/sh/vespa-get-node-state
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+eval $(vespa-security-env)
+
+$VESPA_HOME/libexec/vespa/GetNodeState.pl "$@"
\ No newline at end of file
diff --git a/vespaclient/src/sh/vespa-set-node-state b/vespaclient/src/sh/vespa-set-node-state
new file mode 100755
index 00000000000..25c8fff513b
--- /dev/null
+++ b/vespaclient/src/sh/vespa-set-node-state
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+eval $(vespa-security-env)
+
+$VESPA_HOME/libexec/vespa/SetNodeState.pl "$@"