ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject git commit: ARGUS-113: name of user-group-sync service and its installed directory changed from uxugsync to argus-usersync.
Date Tue, 14 Oct 2014 20:50:39 GMT
Repository: incubator-argus
Updated Branches:
  refs/heads/master 75950752e -> b456922db


ARGUS-113: name of user-group-sync service and its installed directory
changed from uxugsync to argus-usersync.

Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/b456922d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/b456922d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/b456922d

Branch: refs/heads/master
Commit: b456922dbe4069df896e4ecc50dedfd5d0081d56
Parents: 7595075
Author: mneethiraj <mneethiraj@hortonworks.com>
Authored: Tue Oct 14 13:41:43 2014 -0700
Committer: mneethiraj <mneethiraj@hortonworks.com>
Committed: Tue Oct 14 13:41:43 2014 -0700

----------------------------------------------------------------------
 src/main/assembly/usersync.xml                  |  4 ++--
 unixauthservice/conf/unixauthservice.properties |  2 +-
 unixauthservice/scripts/initd                   |  2 +-
 unixauthservice/scripts/install.properties      |  2 +-
 unixauthservice/scripts/install.sh              | 13 +++++++++++--
 unixauthservice/scripts/start.sh                |  2 +-
 6 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/b456922d/src/main/assembly/usersync.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/usersync.xml b/src/main/assembly/usersync.xml
index c662058..f7a554d 100644
--- a/src/main/assembly/usersync.xml
+++ b/src/main/assembly/usersync.xml
@@ -16,11 +16,11 @@
   limitations under the License.
 -->
 <assembly>
-  <id>ugsync</id> 
+  <id>usersync</id>
   <formats>
      <format>tar</format>
   </formats>
-  <baseDirectory>${project.name}-${project.version}-ugsync</baseDirectory>
+  <baseDirectory>${project.name}-${project.version}-usersync</baseDirectory>
   <includeBaseDirectory>true</includeBaseDirectory>
   <moduleSets>
     <moduleSet>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/b456922d/unixauthservice/conf/unixauthservice.properties
----------------------------------------------------------------------
diff --git a/unixauthservice/conf/unixauthservice.properties b/unixauthservice/conf/unixauthservice.properties
index 53c8173..7d583e7 100644
--- a/unixauthservice/conf/unixauthservice.properties
+++ b/unixauthservice/conf/unixauthservice.properties
@@ -148,4 +148,4 @@ ldapGroupSync.userGroupNameAttribute =  memberof, ismemberof
 ldapGroupSync.username.caseConversion=lower
 ldapGroupSync.groupname.caseConversion=lower
 #user sync log path
-logdir=/var/log/uxugsync
\ No newline at end of file
+logdir=/var/log/argus-usersync

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/b456922d/unixauthservice/scripts/initd
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/initd b/unixauthservice/scripts/initd
index b874c06..680f624 100644
--- a/unixauthservice/scripts/initd
+++ b/unixauthservice/scripts/initd
@@ -2,7 +2,7 @@
 
 INSTALL_BASE=/usr/lib
 
-MOD_NAME=uxugsync
+MOD_NAME=argus-usersync
 
 MOD_DIR=${INSTALL_BASE}/${MOD_NAME}
 

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/b456922d/unixauthservice/scripts/install.properties
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/install.properties b/unixauthservice/scripts/install.properties
index 9ea99ce..a32a1f8 100644
--- a/unixauthservice/scripts/install.properties
+++ b/unixauthservice/scripts/install.properties
@@ -96,4 +96,4 @@ SYNC_LDAP_USERNAME_CASE_CONVERSION=lower
 SYNC_LDAP_GROUPNAME_CASE_CONVERSION=lower
 
 #user sync log path
-logdir=/var/log/uxugsync
\ No newline at end of file
+logdir=/var/log/argus-usersync

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/b456922d/unixauthservice/scripts/install.sh
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/install.sh b/unixauthservice/scripts/install.sh
index 383f6fe..6f647ed 100755
--- a/unixauthservice/scripts/install.sh
+++ b/unixauthservice/scripts/install.sh
@@ -18,7 +18,7 @@
 
 INSTALL_BASE=/usr/lib
 
-MOD_NAME="uxugsync"
+MOD_NAME="argus-usersync"
 
 INSTALL_DIR=${INSTALL_BASE}/${MOD_NAME}
 
@@ -182,7 +182,16 @@ cdirname=`basename ${cdir}`
 if [ "${cdirname}" != "" ]
 then
 
-  dstdir=${INSTALL_BASE}/${cdirname}
+  #dstdir=${INSTALL_BASE}/${cdirname}
+
+  VERSION=`cat ${PWD}/version`
+
+  if [ "${VERSION}" != "" ]
+  then
+    dstdir=${INSTALL_BASE}/${MOD_NAME}-${VERSION}
+  else
+    dstdir=${INSTALL_BASE}/${MOD_NAME}-`date '+%Y%m%d%H%M%S'`
+  fi
 
   if [ -d ${dstdir} ]
   then

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/b456922d/unixauthservice/scripts/start.sh
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/start.sh b/unixauthservice/scripts/start.sh
index f6bb2b4..5e3ca5c 100755
--- a/unixauthservice/scripts/start.sh
+++ b/unixauthservice/scripts/start.sh
@@ -33,7 +33,7 @@ pidf=${cdir}/.mypid
 logdir=`grep -P '^[ \t]*logdir[ \t]*=' ${cdir}/install.properties | awk -F= '{ print $2 }'
| tr '\t' ' ' | sed -e 's:[ ]::g'`
 if [ ! -d ${logdir} ]
 then
-	logdir=/var/log/uxugsync
+	logdir=/var/log/argus-usersync
 fi
 cp="${cdir}/dist/*:${cdir}/lib/*:${cdir}/conf"
 [ ! -d ${logdir} ] && mkdir -p ${logdir}


Mime
View raw message