incubator-ranger git commit: RANGER-1206 : Modifications to install scripts to skip checking of DB and java patches in each install

2016-11-10 Thread gautam 
Repository: incubator-ranger
Updated Branches:
  refs/heads/master f70fdbf79 -> bf343a0dd


RANGER-1206 : Modifications to install scripts to skip checking of DB and java 
patches in each install

Signed-off-by: Gautam Borad 


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

Branch: refs/heads/master
Commit: bf343a0dd9aaa4859035dfaa61fe0c5b005ff5b2
Parents: f70fdbf
Author: pradeep agrawal 
Authored: Mon Nov 7 09:17:48 2016 +0530
Committer: Gautam Borad 
Committed: Fri Nov 11 12:06:40 2016 +0530

--
 security-admin/scripts/db_setup.py | 280 +---
 security-admin/scripts/setup.sh|  16 +-
 2 files changed, 230 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bf343a0d/security-admin/scripts/db_setup.py
--
diff --git a/security-admin/scripts/db_setup.py 
b/security-admin/scripts/db_setup.py
index c1efd4a..965314e 100644
--- a/security-admin/scripts/db_setup.py
+++ b/security-admin/scripts/db_setup.py
@@ -102,6 +102,8 @@ def password_validation(password):
log("[E] password contains one of the unsupported 
special characters like \" ' \ `","error")
sys.exit(1)
 
+ranger_version=check_output("ranger-admin version").split("\n")[1]
+
 class BaseDB(object):
 
def check_connection(self, db_name, db_user, db_password):
@@ -128,6 +130,7 @@ class BaseDB(object):
for filename in sorted_files:
currentPatch = 
os.path.join(PATCHES_PATH, filename)
self.import_db_patches(db_name, 
db_user, db_password, currentPatch)
+self.update_applied_patches_status(db_name, 
db_user, db_password, "DB_PATCHES")
else:
log("[I] No patches to apply!","info")
 
@@ -267,11 +270,11 @@ class MysqlConf(BaseDB):
output = check_output(query)
else:
if os_name == "LINUX":
-   query = get_cmd + " -query 
\"insert into x_db_version_h (version, inst_at, inst_by, updated_at, 
updated_by,active) values ('%s', now(), '%s', now(), '%s','N') ;\"" 
%(version,client_host,client_host)
+query = get_cmd + " -query 
\"insert into x_db_version_h (version, inst_at, inst_by, updated_at, 
updated_by,active) values ('%s', now(), '%s', now(), '%s','N') ;\"" 
%(version,ranger_version,client_host)
jisql_log(query, db_password)
ret = 
subprocess.call(shlex.split(query))
elif os_name == "WINDOWS":
-   query = get_cmd + " -query 
\"insert into x_db_version_h (version, inst_at, inst_by, updated_at, 
updated_by,active) values ('%s', now(), '%s', now(), '%s','N') ;\" -c ;" 
%(version,client_host,client_host)
+query = get_cmd + " -query 
\"insert into x_db_version_h (version, inst_at, inst_by, updated_at, 
updated_by,active) values ('%s', now(), '%s', now(), '%s','N') ;\" -c ;" 
%(version,ranger_version,client_host)
jisql_log(query, db_password)
ret = subprocess.call(query)
if ret == 0:
@@ -354,11 +357,11 @@ class MysqlConf(BaseDB):
output = 
check_output(query)
else:
if os_name == "LINUX":
-   query = get_cmd1 + " 
-query \"insert into x_db_version_h (version, inst_at, inst_by, updated_at, 
updated_by,active) values ('%s', now(), '%s', now(), '%s','N') ;\"" 
%(version,client_host,client_host)
+query = get_cmd1 + " 
-query \"insert into x_db_version_h (version, inst_at, inst_by, updated_at, 
updated_by,active) values ('%s', now(), '%s', now(), '%s','N') ;\"" 
%(version,ranger_version,client_host)
jisql_log(query, 
db_password)

incubator-ranger git commit: RANGER-1192 : Ranger PID file not being read if a custom location is provided

2016-11-10 Thread gautam 
Repository: incubator-ranger
Updated Branches:
  refs/heads/master bf343a0dd -> d61ef2a04


RANGER-1192 : Ranger PID file not being read if a custom location is provided

Signed-off-by: Gautam Borad 


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

Branch: refs/heads/master
Commit: d61ef2a0438fd69a9595ddd192bf1b9a01c121d1
Parents: bf343a0
Author: Mehul Parikh 
Authored: Tue Oct 25 15:59:16 2016 +0530
Committer: Gautam Borad 
Committed: Fri Nov 11 12:12:50 2016 +0530

--
 .../scripts/ranger-admin-services.sh| 14 ++--
 kms/scripts/install.properties  |  2 ++
 kms/scripts/ranger-kms  | 14 ++--
 kms/scripts/setup.sh| 12 ++
 security-admin/scripts/install.properties   |  3 +++
 security-admin/scripts/setup.sh | 14 +++-
 tagsync/scripts/install.properties  |  3 +++
 tagsync/scripts/ranger-tagsync-services.sh  | 20 +++--
 tagsync/scripts/setup.py| 22 ++-
 unixauthservice/scripts/install.properties  |  3 +++
 .../scripts/ranger-usersync-services.sh | 23 +++-
 unixauthservice/scripts/setup.py| 22 ++-
 12 files changed, 119 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d61ef2a0/embeddedwebserver/scripts/ranger-admin-services.sh
--
diff --git a/embeddedwebserver/scripts/ranger-admin-services.sh 
b/embeddedwebserver/scripts/ranger-admin-services.sh
index f672236..515e010 100755
--- a/embeddedwebserver/scripts/ranger-admin-services.sh
+++ b/embeddedwebserver/scripts/ranger-admin-services.sh
@@ -29,7 +29,6 @@ XAPOLICYMGR_DIR=`(cd $realScriptDir/..; pwd)`
 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"
-pidf=/var/run/ranger/rangeradmin.pid
 JAVA_OPTS=" ${JAVA_OPTS} -XX:MaxPermSize=256m -Xmx1024m -Xms1024m "
 
 if [ -f ${XAPOLICYMGR_DIR}/ews/webapp/WEB-INF/classes/conf/java_home.sh ]; then
@@ -52,6 +51,17 @@ then
RANGER_ADMIN_LOG_DIR=${XAPOLICYMGR_EWS_DIR}/logs
 fi
 
+if [ -z "${RANGER_PID_DIR_PATH}" ]
+then
+RANGER_PID_DIR_PATH=/var/run/ranger
+fi
+pidf=${RANGER_PID_DIR_PATH}/rangeradmin.pid
+
+if [ -z "${RANGER_USER}" ]
+then
+RANGER_USER=ranger
+fi
+
 start() {
SLEEP_TIME_AFTER_START=5
nohup  java -Dproc_rangeradmin ${JAVA_OPTS} 
-Dlogdir=${RANGER_ADMIN_LOG_DIR} -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/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH"
 org.apache.ranger.server.tomcat.EmbeddedServer > 
${RANGER_ADMIN_LOG_DIR}/catalina.out 2>&1 &
@@ -61,7 +71,7 @@ start() {
if ps -p $VALUE_OF_PID > /dev/null
then
echo $VALUE_OF_PID > ${pidf}
-   chown ranger ${pidf}
+chown ${RANGER_USER} ${pidf}
chmod 660 ${pidf}
pid=`cat $pidf`
echo "Apache Ranger Admin Service with pid ${pid} has started."

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d61ef2a0/kms/scripts/install.properties
--
diff --git a/kms/scripts/install.properties b/kms/scripts/install.properties
index 0516269..d07dc2c 100755
--- a/kms/scripts/install.properties
+++ b/kms/scripts/install.properties
@@ -203,6 +203,8 @@ SSL_TRUSTSTORE_PASSWORD=changeit
 # Custom log directory path
 RANGER_KMS_LOG_DIR=$PWD
 
+#PID file path
+RANGER_KMS_PID_DIR_PATH=/var/run/ranger_kms
 # #  DO NOT MODIFY ANY VARIABLES BELOW 
#
 #
 # --- These deployment variables are not to be modified unless you understand 
the full impact of the changes

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d61ef2a0/kms/scripts/ranger-kms
--
diff --git a/kms/scripts/ranger-kms b/kms/scripts/ranger-kms
index d2937aa..80181d7 100755
--- a/kms/scripts/ranger-kms
+++ b/kms/scripts/ranger-kms
@@ -53,6 +53,16 @@ then
 RANGER_KMS_LOG_DIR=${RANGER_KMS_EWS_DIR}/logs
 fi
 
+if [ -z "${RANGER_KMS_PID_DIR_PATH}" ]
+then
+

svn commit: r16940 - /release/incubator/ranger/0.6.1-incubating/

2016-11-10 Thread coheigea 
Author: coheigea
Date: Thu Nov 10 09:48:00 2016
New Revision: 16940

Log:
Removing 0.6.1 release

Removed:
release/incubator/ranger/0.6.1-incubating/