You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2017/09/20 14:49:12 UTC
ranger git commit: RANGER-1791:The JAVA_HOME was set to jdk1.8.0 in
install.properties when installed and configured Solr for Ranger Audits. The
solr was started fail when started solr.
Repository: ranger
Updated Branches:
refs/heads/master 8a728b5d7 -> 1ba7128dc
RANGER-1791:The JAVA_HOME was set to jdk1.8.0 in install.properties when installed and configured Solr for Ranger Audits. The solr was started fail when started solr.
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/1ba7128d
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/1ba7128d
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/1ba7128d
Branch: refs/heads/master
Commit: 1ba7128dcb4f863658c965e061432480ffdd3020
Parents: 8a728b5
Author: peng.jianhua <pe...@zte.com.cn>
Authored: Mon Sep 18 13:38:38 2017 +0800
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Sep 20 15:48:58 2017 +0100
----------------------------------------------------------------------
security-admin/contrib/solr_for_audit_setup/setup.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/1ba7128d/security-admin/contrib/solr_for_audit_setup/setup.sh
----------------------------------------------------------------------
diff --git a/security-admin/contrib/solr_for_audit_setup/setup.sh b/security-admin/contrib/solr_for_audit_setup/setup.sh
index 22d4c62..f059c03 100755
--- a/security-admin/contrib/solr_for_audit_setup/setup.sh
+++ b/security-admin/contrib/solr_for_audit_setup/setup.sh
@@ -48,6 +48,9 @@ SOLR_MAX_MEM=$(get_prop 'SOLR_MAX_MEM' $PROPFILE)
SOLR_HOST_URL=$(get_prop 'SOLR_HOST_URL' $PROPFILE)
SOLR_SHARDS=$(get_prop 'SOLR_SHARDS' $PROPFILE)
SOLR_REPLICATION=$(get_prop 'SOLR_REPLICATION' $PROPFILE)
+CONFIG_JAVA_HOME=$(get_prop 'JAVA_HOME' $PROPFILE)
+
+JAVA_HOME=${CONFIG_JAVA_HOME:-$JAVA_HOME}
#Current timestamp
ts=$(date +"%m%d%y%H%M%S")