From 84336c128f248421a8a6b8b2451e38c30688a978 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Tue, 28 May 2019 13:04:02 +0200 Subject: Rename 'vespa-security-env' -> 'vespa-security-env' --- security-tools/CMakeLists.txt | 2 +- security-tools/README.md | 2 +- .../vespa/security/tool/securityenv/Main.java | 11 ++++ .../com/yahoo/vespa/security/tool/tlsenv/Main.java | 11 ---- security-tools/src/main/sh/vespa-security-env | 73 ++++++++++++++++++++++ security-tools/src/main/sh/vespa-tls-env | 73 ---------------------- 6 files changed, 86 insertions(+), 86 deletions(-) create mode 100644 security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/Main.java delete mode 100644 security-tools/src/main/java/com/yahoo/vespa/security/tool/tlsenv/Main.java create mode 100644 security-tools/src/main/sh/vespa-security-env delete mode 100644 security-tools/src/main/sh/vespa-tls-env (limited to 'security-tools') diff --git a/security-tools/CMakeLists.txt b/security-tools/CMakeLists.txt index b6a90392927..234bb7f7497 100644 --- a/security-tools/CMakeLists.txt +++ b/security-tools/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_fat_java_artifact(security-tools) -vespa_install_script(src/main/sh/vespa-tls-env vespa-tls-env bin) +vespa_install_script(src/main/sh/vespa-security-env vespa-security-env bin) diff --git a/security-tools/README.md b/security-tools/README.md index ceee3997a3b..077edd04a58 100644 --- a/security-tools/README.md +++ b/security-tools/README.md @@ -1,3 +1,3 @@ # security-tools -Contains the "vespa-tls-env" command line tool for Vespa. \ No newline at end of file +Contains the "vespa-security-env" command line tool for Vespa. \ No newline at end of file diff --git a/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/Main.java b/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/Main.java new file mode 100644 index 00000000000..f57575b406a --- /dev/null +++ b/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/Main.java @@ -0,0 +1,11 @@ +// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.security.tool.securityenv; + +/** + * @author bjorncs + */ +public class Main { + public static void main(String[] args) { + System.out.println("TODO implementation"); + } +} diff --git a/security-tools/src/main/java/com/yahoo/vespa/security/tool/tlsenv/Main.java b/security-tools/src/main/java/com/yahoo/vespa/security/tool/tlsenv/Main.java deleted file mode 100644 index 9472a8b636d..00000000000 --- a/security-tools/src/main/java/com/yahoo/vespa/security/tool/tlsenv/Main.java +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.security.tool.tlsenv; - -/** - * @author bjorncs - */ -public class Main { - public static void main(String[] args) { - System.out.println("TODO implementation"); - } -} diff --git a/security-tools/src/main/sh/vespa-security-env b/security-tools/src/main/sh/vespa-security-env new file mode 100644 index 00000000000..63d71920f99 --- /dev/null +++ b/security-tools/src/main/sh/vespa-security-env @@ -0,0 +1,73 @@ +#!/usr/bin/env bash +# Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +# BEGIN environment bootstrap section +# Do not edit between here and END as this section should stay identical in all scripts + +findpath () { + myname=${0} + mypath=${myname%/*} + myname=${myname##*/} + if [ "$mypath" ] && [ -d "$mypath" ]; then + return + fi + mypath=$(pwd) + if [ -f "${mypath}/${myname}" ]; then + return + fi + echo "FATAL: Could not figure out the path where $myname lives from $0" + exit 1 +} + +COMMON_ENV=libexec/vespa/common-env.sh + +source_common_env () { + if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then + export VESPA_HOME + common_env=$VESPA_HOME/$COMMON_ENV + if [ -f "$common_env" ]; then + . $common_env + return + fi + fi + return 1 +} + +findroot () { + source_common_env && return + if [ "$VESPA_HOME" ]; then + echo "FATAL: bad VESPA_HOME value '$VESPA_HOME'" + exit 1 + fi + if [ "$ROOT" ] && [ -d "$ROOT" ]; then + VESPA_HOME="$ROOT" + source_common_env && return + fi + findpath + while [ "$mypath" ]; do + VESPA_HOME=${mypath} + source_common_env && return + mypath=${mypath%/*} + done + echo "FATAL: missing VESPA_HOME environment variable" + echo "Could not locate $COMMON_ENV anywhere" + exit 1 +} + +findhost () { + if [ "${VESPA_HOSTNAME}" = "" ]; then + VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 + fi + validate="${VESPA_HOME}/bin/vespa-validate-hostname" + if [ -f "$validate" ]; then + "$validate" "${VESPA_HOSTNAME}" || exit 1 + fi + export VESPA_HOSTNAME +} + +findroot +findhost + +# END environment bootstrap section + +exec java -Djava.awt.headless=true -cp ${VESPA_HOME}/lib/jars/security-tools-jar-with-dependencies.jar com.yahoo.vespa.security.tool.securityenv.Main "$@" \ No newline at end of file diff --git a/security-tools/src/main/sh/vespa-tls-env b/security-tools/src/main/sh/vespa-tls-env deleted file mode 100644 index 19b6ccf4c12..00000000000 --- a/security-tools/src/main/sh/vespa-tls-env +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -# BEGIN environment bootstrap section -# Do not edit between here and END as this section should stay identical in all scripts - -findpath () { - myname=${0} - mypath=${myname%/*} - myname=${myname##*/} - if [ "$mypath" ] && [ -d "$mypath" ]; then - return - fi - mypath=$(pwd) - if [ -f "${mypath}/${myname}" ]; then - return - fi - echo "FATAL: Could not figure out the path where $myname lives from $0" - exit 1 -} - -COMMON_ENV=libexec/vespa/common-env.sh - -source_common_env () { - if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - export VESPA_HOME - common_env=$VESPA_HOME/$COMMON_ENV - if [ -f "$common_env" ]; then - . $common_env - return - fi - fi - return 1 -} - -findroot () { - source_common_env && return - if [ "$VESPA_HOME" ]; then - echo "FATAL: bad VESPA_HOME value '$VESPA_HOME'" - exit 1 - fi - if [ "$ROOT" ] && [ -d "$ROOT" ]; then - VESPA_HOME="$ROOT" - source_common_env && return - fi - findpath - while [ "$mypath" ]; do - VESPA_HOME=${mypath} - source_common_env && return - mypath=${mypath%/*} - done - echo "FATAL: missing VESPA_HOME environment variable" - echo "Could not locate $COMMON_ENV anywhere" - exit 1 -} - -findhost () { - if [ "${VESPA_HOSTNAME}" = "" ]; then - VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 - fi - validate="${VESPA_HOME}/bin/vespa-validate-hostname" - if [ -f "$validate" ]; then - "$validate" "${VESPA_HOSTNAME}" || exit 1 - fi - export VESPA_HOSTNAME -} - -findroot -findhost - -# END environment bootstrap section - -exec java -Djava.awt.headless=true -cp ${VESPA_HOME}/lib/jars/security-tools-jar-with-dependencies.jar com.yahoo.vespa.security.tool.tlsenv.Main "$@" \ No newline at end of file -- cgit v1.2.3