Repository: knox Updated Branches: refs/heads/master 477d842c2 -> 2c9adff8a
KNOX-561: Allow Knox pid directory to be configured via the knox-env.sh file Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/2c9adff8 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/2c9adff8 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/2c9adff8 Branch: refs/heads/master Commit: 2c9adff8ae7693c5bdc8f77aa9965d7a08fa900f Parents: 477d842 Author: Kevin Minder <[email protected]> Authored: Fri Jun 12 12:20:53 2015 -0400 Committer: Kevin Minder <[email protected]> Committed: Fri Jun 12 12:20:53 2015 -0400 ---------------------------------------------------------------------- CHANGES | 3 ++- gateway-release/home/bin/gateway.sh | 8 ++++---- gateway-release/home/bin/knox-env.sh | 2 ++ gateway-release/home/bin/ldap.sh | 8 ++++---- 4 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/2c9adff8/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 68095a1..961f23c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,11 +1,12 @@ ------------------------------------------------------------------------------ -Release Notes - Apache Knox - Version 0.6.0 +Release Notes - Apache Knox - Version 0.6.1 ------------------------------------------------------------------------------ ** New Feature * [KNOX-547] - KnoxCLI adds new validate-topology and list-topologies commands. ** Improvement * [KNOX-553] - Added topology validation from KnoxCLI to TopologyService deployment. + * [KNOX-561] - Allow Knox pid directory to be configured via the knox-env.sh file ** Bug * [KNOX-554] - Fixed support for gateway.path change + added support for X-Forward-* headers in admin topology API. http://git-wip-us.apache.org/repos/asf/knox/blob/2c9adff8/gateway-release/home/bin/gateway.sh ---------------------------------------------------------------------- diff --git a/gateway-release/home/bin/gateway.sh b/gateway-release/home/bin/gateway.sh index e4cec6f..79fe10f 100755 --- a/gateway-release/home/bin/gateway.sh +++ b/gateway-release/home/bin/gateway.sh @@ -26,6 +26,9 @@ APP_NAME=gateway # Start/stop script location APP_BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +# Setup the common environment +. $APP_BIN_DIR/knox-env.sh + # The app's jar name APP_JAR="$APP_BIN_DIR/gateway.jar" @@ -57,7 +60,7 @@ APP_PID=0 APP_LAUNCH_CMD=$1 # Name of PID file -APP_PID_DIR="$APP_HOME_DIR/pids" +[[ $ENV_PID_DIR ]] && APP_PID_DIR="$ENV_PID_DIR" || APP_PID_DIR="$APP_HOME_DIR/pids" APP_PID_FILE="$APP_PID_DIR/$APP_NAME.pid" # Name of LOG/OUT/ERR file @@ -70,9 +73,6 @@ APP_START_WAIT_TIME=2 # The kill wait time limit APP_KILL_WAIT_TIME=10 -# Setup the common environment -. $APP_BIN_DIR/knox-env.sh - function main { case "$1" in setup) http://git-wip-us.apache.org/repos/asf/knox/blob/2c9adff8/gateway-release/home/bin/knox-env.sh ---------------------------------------------------------------------- diff --git a/gateway-release/home/bin/knox-env.sh b/gateway-release/home/bin/knox-env.sh index 8124020..1876a5d 100644 --- a/gateway-release/home/bin/knox-env.sh +++ b/gateway-release/home/bin/knox-env.sh @@ -17,6 +17,8 @@ # limitations under the License. # +ENV_PID_DIR="" + JAVA_VERSION_PATTERNS=( "1.6.0_31/bin/java$" "1.6.0_.*/bin/java$" "1.6.0.*/bin/java$" "1.6\..*/bin/java$" "/bin/java$" ) function findJava() { http://git-wip-us.apache.org/repos/asf/knox/blob/2c9adff8/gateway-release/home/bin/ldap.sh ---------------------------------------------------------------------- diff --git a/gateway-release/home/bin/ldap.sh b/gateway-release/home/bin/ldap.sh index a51ef23..c9b2c0b 100755 --- a/gateway-release/home/bin/ldap.sh +++ b/gateway-release/home/bin/ldap.sh @@ -29,6 +29,9 @@ APP_JAR_NAME=ldap.jar # start/stop script location APP_BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +# Setup the common environment +. $APP_BIN_DIR/knox-env.sh + # The app's jar name APP_JAR="$APP_BIN_DIR/$APP_JAR_NAME" @@ -57,7 +60,7 @@ APP_LAUNCH_COMMAND=$1 APP_PID=0 # The name of the PID file -APP_PID_DIR="$APP_HOME_DIR/pids" +[[ $ENV_PID_DIR ]] && APP_PID_DIR="$ENV_PID_DIR" || APP_PID_DIR="$APP_HOME_DIR/pids" APP_PID_FILE="$APP_PID_DIR/$APP_NAME.pid" #Name of LOG/OUT/ERR file @@ -70,9 +73,6 @@ APP_START_WAIT_TIME=2 # The kill wait time limit APP_KILL_WAIT_TIME=10 -# Setup the common environment -. $APP_BIN_DIR/knox-env.sh - function main { case "$1" in start)
