Return-Path: X-Original-To: apmail-argus-commits-archive@minotaur.apache.org Delivered-To: apmail-argus-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 06F17178F5 for ; Fri, 31 Oct 2014 06:50:41 +0000 (UTC) Received: (qmail 25128 invoked by uid 500); 31 Oct 2014 06:50:40 -0000 Delivered-To: apmail-argus-commits-archive@argus.apache.org Received: (qmail 25105 invoked by uid 500); 31 Oct 2014 06:50:40 -0000 Mailing-List: contact commits-help@argus.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@argus.incubator.apache.org Delivered-To: mailing list commits@argus.incubator.apache.org Received: (qmail 25096 invoked by uid 99); 31 Oct 2014 06:50:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Oct 2014 06:50:40 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 31 Oct 2014 06:50:39 +0000 Received: (qmail 18977 invoked by uid 99); 31 Oct 2014 06:49:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Oct 2014 06:49:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8BC10A073DB; Fri, 31 Oct 2014 06:49:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: madhan@apache.org To: commits@argus.incubator.apache.org Message-Id: <97582bb0f45a4c0eaeb3998b3c1d690c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Updated start scripts to load custom JAVA OPTS Date: Fri, 31 Oct 2014 06:49:03 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-argus Updated Branches: refs/heads/argus2ranger 779c38598 -> 6a923848d Updated start scripts to load custom JAVA OPTS Signed-off-by: Madhan Neethiraj Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/6a923848 Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/6a923848 Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/6a923848 Branch: refs/heads/argus2ranger Commit: 6a923848d327197540a016a8bcda9b780749457f Parents: 779c385 Author: Don Bosco Durai Authored: Thu Oct 30 23:33:36 2014 -0700 Committer: Madhan Neethiraj Committed: Thu Oct 30 23:46:42 2014 -0700 ---------------------------------------------------------------------- embededwebserver/scripts/start-ranger-admin.sh | 13 +++++++++---- embededwebserver/scripts/stop-ranger-admin.sh | 13 ++++++++----- unixauthservice/scripts/start.sh | 8 +++++++- 3 files changed, 24 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6a923848/embededwebserver/scripts/start-ranger-admin.sh ---------------------------------------------------------------------- diff --git a/embededwebserver/scripts/start-ranger-admin.sh b/embededwebserver/scripts/start-ranger-admin.sh index d0c7946..b560794 100755 --- a/embededwebserver/scripts/start-ranger-admin.sh +++ b/embededwebserver/scripts/start-ranger-admin.sh @@ -23,14 +23,19 @@ XAPOLICYMGR_EWS_DIR=${XAPOLICYMGR_DIR}/ews RANGER_JAAS_LIB_DIR="${XAPOLICYMGR_EWS_DIR}/ranger_jaas" RANGER_JAAS_CONF_DIR="${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf/ranger_jaas" -if [ -f ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/ranger_admin_env.sh ]; then - . ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/ranger_admin_env.sh -fi +JAVA_OPTS=" ${JAVA_OPTS} -XX:MaxPermSize=256m -Xmx1024m -Xms1024m " #export JAVA_HOME= if [ -f ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/java_home.sh ]; then . ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/java_home.sh fi + +for custom_env_script in `find ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/ -name "ranger-admin-env*"`; do + if [ -f $custom_env_script ]; then + . $custom_env_script + fi +done + if [ "$JAVA_HOME" != "" ]; then export PATH=$JAVA_HOME/bin:$PATH fi @@ -40,5 +45,5 @@ if [ ! -d logs ] then mkdir logs fi -java -Dproc_rangeradmin -Xmx1024m -Xms1024m -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${JAVA_HOME}/lib/*" com.xasecure.server.tomcat.EmbededServer > logs/catalina.out 2>&1 & +java -Dproc_rangeradmin ${JAVA_OPTS} -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${JAVA_HOME}/lib/*" com.xasecure.server.tomcat.EmbededServer > logs/catalina.out 2>&1 & echo "Apache Ranger Admin has started" http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6a923848/embededwebserver/scripts/stop-ranger-admin.sh ---------------------------------------------------------------------- diff --git a/embededwebserver/scripts/stop-ranger-admin.sh b/embededwebserver/scripts/stop-ranger-admin.sh index cc35f8a..9fb9f04 100755 --- a/embededwebserver/scripts/stop-ranger-admin.sh +++ b/embededwebserver/scripts/stop-ranger-admin.sh @@ -24,14 +24,17 @@ XAPOLICYMGR_EWS_DIR=${XAPOLICYMGR_DIR}/ews RANGER_JAAS_LIB_DIR="${XAPOLICYMGR_EWS_DIR}/ranger_jaas" RANGER_JAAS_CONF_DIR="${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf/ranger_jaas" -if [ -f ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/ranger_admin_env.sh ]; then - . ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/ranger_admin_env.sh -fi - #export JAVA_HOME= if [ -f ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/java_home.sh ]; then . ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/java_home.sh fi + +for custom_env_script in `find ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/ -name "ranger-admin-env*"`; do + if [ -f $custom_env_script ]; then + . $custom_env_script + fi +done + if [ "$JAVA_HOME" != "" ]; then export PATH=$JAVA_HOME/bin:$PATH fi @@ -41,5 +44,5 @@ if [ ! -d logs ] then mkdir logs fi -java -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}" com.xasecure.server.tomcat.StopEmbededServer > logs/catalina.out 2>&1 +java ${JAVA_OPTS} -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}" com.xasecure.server.tomcat.StopEmbededServer > logs/catalina.out 2>&1 echo "Apache Ranger Admin has been stopped." http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6a923848/unixauthservice/scripts/start.sh ---------------------------------------------------------------------- diff --git a/unixauthservice/scripts/start.sh b/unixauthservice/scripts/start.sh index 96b507f..07b0315 100755 --- a/unixauthservice/scripts/start.sh +++ b/unixauthservice/scripts/start.sh @@ -25,6 +25,12 @@ echo "Starting UnixAuthenticationService" #export JAVA_HOME= . ${cdir}/conf/java_home.sh +for custom_env_script in `find ${cdir}/conf/ -name "ranger-usersync-env*"`; do + if [ -f $custom_env_script ]; then + . $custom_env_script + fi +done + if [ "$JAVA_HOME" != "" ]; then export PATH=$JAVA_HOME/bin:$PATH fi @@ -42,7 +48,7 @@ cp="${cdir}/dist/*:${cdir}/lib/*:${cdir}/conf" ${cdir}/stop.sh cd ${cdir} umask 0077 -nohup java -Dproc_rangerusersync -Dlogdir="${logdir}" -cp "${cp}" com.xasecure.authentication.UnixAuthenticationService > ${logdir}/auth.log 2>&1 & +nohup java -Dproc_rangerusersync ${JAVA_OPTS} -Dlogdir="${logdir}" -cp "${cp}" com.xasecure.authentication.UnixAuthenticationService > ${logdir}/auth.log 2>&1 & echo $! > ${pidf} sleep 5 port=`grep '^[ ]*authServicePort' ${cdir}/conf/unixauthservice.properties | awk -F= '{ print $2 }' | awk '{ print $1 }'`