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 7F54E17848 for ; Fri, 31 Oct 2014 21:04:02 +0000 (UTC) Received: (qmail 92170 invoked by uid 500); 31 Oct 2014 21:04:02 -0000 Delivered-To: apmail-argus-commits-archive@argus.apache.org Received: (qmail 92122 invoked by uid 500); 31 Oct 2014 21:04:02 -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 92068 invoked by uid 99); 31 Oct 2014 21:04:02 -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 21:04:02 +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 21:04:00 +0000 Received: (qmail 91761 invoked by uid 99); 31 Oct 2014 21:03:40 -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 21:03:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C22E492A078; Fri, 31 Oct 2014 21:03:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sneethir@apache.org To: commits@argus.incubator.apache.org Date: Fri, 31 Oct 2014 21:03:48 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/15] git commit: Changed path to binaries X-Virus-Checked: Checked by ClamAV on apache.org Changed path to binaries Signed-off-by: sneethiraj Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/6c127542 Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/6c127542 Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/6c127542 Branch: refs/heads/master Commit: 6c127542ca99b71e664968421b476b0fe994fae8 Parents: 6af44c4 Author: Don Bosco Durai Authored: Wed Oct 29 20:18:02 2014 -0700 Committer: sneethiraj Committed: Wed Oct 29 20:46:55 2014 -0700 ---------------------------------------------------------------------- embededwebserver/scripts/ranger-admin | 4 ++-- embededwebserver/scripts/start-ranger-admin.sh | 5 +++-- embededwebserver/scripts/stop-ranger-admin.sh | 6 ++++-- security-admin/scripts/setup.sh | 4 ++-- unixauthservice/scripts/start.sh | 9 ++++----- unixauthservice/scripts/stop.sh | 6 +++++- 6 files changed, 20 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6c127542/embededwebserver/scripts/ranger-admin ---------------------------------------------------------------------- diff --git a/embededwebserver/scripts/ranger-admin b/embededwebserver/scripts/ranger-admin index 3258692..c7e52aa 100755 --- a/embededwebserver/scripts/ranger-admin +++ b/embededwebserver/scripts/ranger-admin @@ -21,10 +21,10 @@ BIN_PATH=/usr/bin case $1 in start) - /bin/su --login $LINUX_USER "${BIN_PATH}/start-ranger-admin" + /bin/su --login $LINUX_USER "${BIN_PATH}/ranger-admin-start" ;; stop) - /bin/su --login $LINUX_USER "${BIN_PATH}/stop-ranger-admin" + /bin/su --login $LINUX_USER "${BIN_PATH}/ranger-admin-stop" ;; restart) /bin/su --login $LINUX_USER "${BIN_PATH}/stop-ranger-admin.sh" && sleep 30 http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6c127542/embededwebserver/scripts/start-ranger-admin.sh ---------------------------------------------------------------------- diff --git a/embededwebserver/scripts/start-ranger-admin.sh b/embededwebserver/scripts/start-ranger-admin.sh index fb6ad2e..d0c7946 100755 --- a/embededwebserver/scripts/start-ranger-admin.sh +++ b/embededwebserver/scripts/start-ranger-admin.sh @@ -15,8 +15,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -cd `dirname $0` -XAPOLICYMGR_DIR=`pwd` +realScriptPath=`readlink -f $0` +realScriptDir=`dirname $realScriptPath` +XAPOLICYMGR_DIR=`(cd $realScriptDir/..; pwd)` XAPOLICYMGR_EWS_DIR=${XAPOLICYMGR_DIR}/ews RANGER_JAAS_LIB_DIR="${XAPOLICYMGR_EWS_DIR}/ranger_jaas" http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6c127542/embededwebserver/scripts/stop-ranger-admin.sh ---------------------------------------------------------------------- diff --git a/embededwebserver/scripts/stop-ranger-admin.sh b/embededwebserver/scripts/stop-ranger-admin.sh index 97179cf..cc35f8a 100755 --- a/embededwebserver/scripts/stop-ranger-admin.sh +++ b/embededwebserver/scripts/stop-ranger-admin.sh @@ -15,8 +15,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -cd `dirname $0` -XAPOLICYMGR_DIR=`pwd` +realScriptPath=`readlink -f $0` +realScriptDir=`dirname $realScriptPath` +XAPOLICYMGR_DIR=`(cd $realScriptDir/..; pwd)` + XAPOLICYMGR_EWS_DIR=${XAPOLICYMGR_DIR}/ews RANGER_JAAS_LIB_DIR="${XAPOLICYMGR_EWS_DIR}/ranger_jaas" http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6c127542/security-admin/scripts/setup.sh ---------------------------------------------------------------------- diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh index 6db9984..a81a5f8 100755 --- a/security-admin/scripts/setup.sh +++ b/security-admin/scripts/setup.sh @@ -1062,7 +1062,7 @@ do_authentication_setup(){ if [ $authentication_method = "LDAP" ] ; then log "[I] Loading LDAP attributes and properties"; newPropertyValue='' - ldap_file=$app_home/WEB-INF/classes/conf/ranger_jaas/xa_ldap.properties + ldap_file=$app_home/WEB-INF/classes/conf/xa_ldap.properties if test -f $ldap_file; then log "[I] $ldap_file file found" propertyName=xa_ldap_url @@ -1097,7 +1097,7 @@ do_authentication_setup(){ if [ $authentication_method = "ACTIVE_DIRECTORY" ] ; then log "[I] Loading ACTIVE DIRECTORY attributes and properties"; newPropertyValue='' - ldap_file=$app_home/WEB-INF/classes/conf/ranger_jaas/xa_ldap.properties + ldap_file=$app_home/WEB-INF/classes/conf/xa_ldap.properties if test -f $ldap_file; then log "[I] $ldap_file file found" propertyName=xa_ldap_ad_url http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6c127542/unixauthservice/scripts/start.sh ---------------------------------------------------------------------- diff --git a/unixauthservice/scripts/start.sh b/unixauthservice/scripts/start.sh index d75a8c3..96b507f 100755 --- a/unixauthservice/scripts/start.sh +++ b/unixauthservice/scripts/start.sh @@ -15,12 +15,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -cdir=`dirname $0` -if [ "${cdir}" = "." ] -then - cdir=`pwd` -fi +realScriptPath=`readlink -f $0` +realScriptDir=`dirname $realScriptPath` +cd $realScriptDir +cdir=`pwd` echo "Starting UnixAuthenticationService" #export JAVA_HOME= http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/6c127542/unixauthservice/scripts/stop.sh ---------------------------------------------------------------------- diff --git a/unixauthservice/scripts/stop.sh b/unixauthservice/scripts/stop.sh index ccdfd51..1933364 100755 --- a/unixauthservice/scripts/stop.sh +++ b/unixauthservice/scripts/stop.sh @@ -15,7 +15,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -cdir=`dirname $0` +realScriptPath=`readlink -f $0` +realScriptDir=`dirname $realScriptPath` +cd $realScriptDir +cdir=`pwd` + pidf=${cdir}/.mypid port=`grep '^[ ]*authServicePort' ${cdir}/conf/unixauthservice.properties | awk -F= '{ print $2 }' | awk '{ print $1 }'` pid=`netstat -antp | grep LISTEN | grep ${port} | awk '{ print $NF }' | awk -F/ '{ if ($2 == "java") { print $1 } }'`