ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sneet...@apache.org
Subject git commit: ARGUS-87: Modified to fix install.properties & install process to avoid derived vars in install.properties file
Date Sat, 27 Sep 2014 22:32:20 GMT
Repository: incubator-argus
Updated Branches:
  refs/heads/master 5ff59f41c -> 548aa516a


ARGUS-87: Modified to fix install.properties & install process to avoid derived vars in
install.properties file


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

Branch: refs/heads/master
Commit: 548aa516ae0ef47240465a6a928c2d8101c1bbe1
Parents: 5ff59f4
Author: sneethiraj <sneethir@apache.org>
Authored: Sat Sep 27 15:27:08 2014 -0700
Committer: sneethiraj <sneethir@apache.org>
Committed: Sat Sep 27 15:27:08 2014 -0700

----------------------------------------------------------------------
 agents-common/scripts/enable-agent.sh           | 68 ++++++++++++++++++--
 .../hadoop/config/XaSecureConfiguration.java    | 41 +++++++++---
 .../utils/install/XmlConfigChanger.java         |  3 +
 hbase-agent/conf/xasecure-audit-changes.cfg     |  4 +-
 hbase-agent/scripts/install.properties          | 33 +---------
 hdfs-agent/conf/xasecure-audit-changes.cfg      |  4 +-
 hdfs-agent/scripts/install.properties           | 34 +---------
 hive-agent/conf/xasecure-audit-changes.cfg      |  4 +-
 hive-agent/scripts/install.properties           | 34 +---------
 knox-agent/conf/xasecure-audit-changes.cfg      |  4 +-
 knox-agent/scripts/install.properties           | 24 +------
 .../.settings/org.eclipse.wst.common.component  |  7 +-
 storm-agent/conf/xasecure-audit-changes.cfg     |  4 +-
 storm-agent/scripts/install.properties          | 35 +---------
 14 files changed, 121 insertions(+), 178 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/agents-common/scripts/enable-agent.sh
----------------------------------------------------------------------
diff --git a/agents-common/scripts/enable-agent.sh b/agents-common/scripts/enable-agent.sh
index 237d61d..ab0c6c0 100755
--- a/agents-common/scripts/enable-agent.sh
+++ b/agents-common/scripts/enable-agent.sh
@@ -8,9 +8,18 @@ PROJ_NAME=argus
 BASE_CONF_DIR=/etc/${PROJ_NAME}
 
 #
-# Identify the component, action from the script file
+# The script should be run by "root" user
 #
 
+if [ ! -w /etc/passwd ]
+then
+    echo "ERROR: $0 script should be run as root."
+    exit 1
+fi
+
+#
+# Identify the component, action from the script file
+#
 
 basedir=`dirname $0`
 if [ "${basedir}" = "." ]
@@ -240,6 +249,13 @@ then
 			fi
 			cp ${cf} ${HCOMPONENT_CONF_DIR}/
 			chown ${CFG_OWNER_INF} ${HCOMPONENT_CONF_DIR}/${cfb}
+			#
+			# To support Hive and HBase Client to be able to read the configuration ...
+			#
+			if [ "${HCOMPONENT_NAME}" = "hive" -o "${HCOMPONENT_NAME}" = "hbase" ]
+			then
+				chmod a+r ${HCOMPONENT_CONF_DIR}/${cfb}
+			fi
 		done
     else
 		if [ -f ${HCOMPONENT_CONF_DIR}/argus-security.xml ]
@@ -248,6 +264,43 @@ then
 		fi
 	fi
 
+	#
+	# Ensure that POLICY_CACHE_FILE_PATH is accessible
+	#
+	REPO_NAME=`grep '^REPOSITORY_NAME' ${INSTALL_ARGS} | awk -F= '{ print $2 }'`
+	export POLICY_CACHE_FILE_PATH=/etc/${PROJ_NAME}/${REPO_NAME}/policycache
+	export CREDENTIAL_PROVIDER_FILE=/etc/${PROJ_NAME}/${REPO_NAME}/cred.jceks
+	if [ ! -d ${POLICY_CACHE_FILE_PATH} ]
+	then
+		mkdir -p ${POLICY_CACHE_FILE_PATH}
+	fi
+	chmod a+rx /etc/${PROJ_NAME}
+	chmod a+rx /etc/${PROJ_NAME}/${REPO_NAME}
+	chmod a+rx ${POLICY_CACHE_FILE_PATH}
+	chown -R ${CFG_OWNER_INF} /etc/${PROJ_NAME}/${REPO_NAME}
+	
+
+	#
+	# We need to do the AUDIT JDBC url 
+	#
+
+	db_flavor=`grep '^XAAUDIT.DB.FLAVOUR' ${INSTALL_ARGS} | awk -F= '{ print $2 }'`
+    audit_db_hostname=`grep '^XAAUDIT.DB.HOSTNAME'  ${INSTALL_ARGS}  | awk -F= '{ print $2
}'`
+    audit_db_name=`grep '^XAAUDIT.DB.DATABASE_NAME'  ${INSTALL_ARGS} | awk -F= '{ print $2
}'`
+
+	if [ "${db_flavor}" = "MYSQL" ]
+	then
+    	export XAAUDIT_DB_JDBC_URL="jdbc:mysql://${audit_db_hostname}/${audit_db_name}"
+    	export XAAUDIT_DB_JDBC_DRIVER="com.mysql.jdbc.Driver"
+	fi
+	
+	if [ "${db_flavor}" = "ORACLE" ]
+	then
+    	export XAAUDIT_DB_JDBC_URL="jdbc:oracle:thin:\@//${audit_db_hostname}"
+    	export XAAUDIT_DB_JDBC_DRIVER="oracle.jdbc.OracleDriver"
+	fi
+
+
 	for f in ${PROJ_INSTALL_DIR}/install/conf.templates/${action}/*.cfg
 	do
 		if [ -f "${f}" ]
@@ -278,7 +331,7 @@ then
                 	diff -w ${newfn} ${fullpathorgfn} > /dev/null 2>&1
                     if [ $? -ne 0 ]
                     then
-                    	cp ${newfn} ${fullpathorgfn}
+                    	cat ${newfn} > ${fullpathorgfn}
                     fi
                	else
 				    echo "ERROR: Unable to make changes to config. file: ${fullpathorgfn}"
@@ -327,8 +380,8 @@ then
 	# Encrypt the password and keep it secure in Credential Provider API
 	#
 	
-	CredFile=`grep '^CREDENTIAL_PROVIDER_FILE' ${INSTALL_ARGS} | awk -F= '{ print $2 }'`
-	
+	CredFile=${CREDENTIAL_PROVIDER_FILE}
+
 	if ! [ `echo ${CredFile} | grep '^/.*'` ]
 	then
   	echo "ERROR:Please enter the Credential File Store with proper file path"
@@ -346,7 +399,7 @@ then
     		echo "ERROR: Unable to create credential store file path"
 			exit 1
 		fi
-		chmod go+rx "${pardir}"
+		chmod a+rx "${pardir}"
 	fi
 
 	#
@@ -380,6 +433,11 @@ then
 	create_jceks "${ssltruststoreAlias}" "${ssltruststoreCred}" "${CredFile}"
 	
 	chown ${CFG_OWNER_INF} ${CredFile}
+	#
+	# To allow all users in the server (where Hive CLI and HBase CLI is used),
+	# user needs to have read access for the credential file.
+	#
+	chmod a+r ${CredFile} 
 	
 fi
 

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/agents-common/src/main/java/com/xasecure/authorization/hadoop/config/XaSecureConfiguration.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/com/xasecure/authorization/hadoop/config/XaSecureConfiguration.java
b/agents-common/src/main/java/com/xasecure/authorization/hadoop/config/XaSecureConfiguration.java
index e026b00..c0b1560 100644
--- a/agents-common/src/main/java/com/xasecure/authorization/hadoop/config/XaSecureConfiguration.java
+++ b/agents-common/src/main/java/com/xasecure/authorization/hadoop/config/XaSecureConfiguration.java
@@ -34,6 +34,7 @@
 package com.xasecure.authorization.hadoop.config;
 
 import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
@@ -67,15 +68,33 @@ public class XaSecureConfiguration extends Configuration {
 			addResource(auditFileLocation) ;
 		}
 		else {
-			addResource(XaSecureHadoopConstants.XASECURE_AUDIT_FILE) ;
+			addResourceIfReadable(XaSecureHadoopConstants.XASECURE_AUDIT_FILE) ;
 		}
-		addResource(XaSecureHadoopConstants.XASECURE_HDFS_SECURITY_FILE);
-		addResource(XaSecureHadoopConstants.XASECURE_KNOX_SECURITY_FILE);
-		addResource(XaSecureHadoopConstants.XASECURE_HBASE_SECURITY_FILE) ;
-		addResource(XaSecureHadoopConstants.XASECURE_HIVE_SECURITY_FILE) ;
-		addResource(XaSecureHadoopConstants.XASECURE_STORM_SECURITY_FILE);
+		addResourceIfReadable(XaSecureHadoopConstants.XASECURE_HDFS_SECURITY_FILE);
+		addResourceIfReadable(XaSecureHadoopConstants.XASECURE_KNOX_SECURITY_FILE);
+		addResourceIfReadable(XaSecureHadoopConstants.XASECURE_HBASE_SECURITY_FILE) ;
+		addResourceIfReadable(XaSecureHadoopConstants.XASECURE_HIVE_SECURITY_FILE) ;
+		addResourceIfReadable(XaSecureHadoopConstants.XASECURE_STORM_SECURITY_FILE);
 		
 	}
+	
+	@SuppressWarnings("deprecation")
+	private void addResourceIfReadable(String aResourceName) {
+		String fName = getFileLocation(aResourceName) ;
+		if (fName != null) {
+			File f = new File(fName) ;
+			if (f.exists() && f.canRead()) {
+				URL fUrl = null ;
+				try {
+					fUrl = f.toURL() ;
+					addResource(fUrl) ;
+				} catch (MalformedURLException e) {
+					LOG.debug("Unable to find URL for the resource name [" + aResourceName +"]. Ignoring
the resource:" + aResourceName);
+				}
+			}
+		}
+	}
+	
 
 	public static XaSecureConfiguration getInstance() {
 		if (config == null) {
@@ -123,9 +142,11 @@ public class XaSecureConfiguration extends Configuration {
 			for(String  cfgFile : 	new String[] {  "hive-site.xml",  "hbase-site.xml",  "hdfs-site.xml"
} ) {
 				String loc = getFileLocation(cfgFile) ;
 				if (loc != null) {
-					File parentFile = new File(loc).getParentFile() ;
-					ret = new File(parentFile, XaSecureHadoopConstants.XASECURE_AUDIT_FILE).toURL() ;
-					break ;
+					if (new File(loc).canRead()) {
+						File parentFile = new File(loc).getParentFile() ;
+						ret = new File(parentFile, XaSecureHadoopConstants.XASECURE_AUDIT_FILE).toURL() ;
+						break ;
+					}
 				}
 			}
 		}
@@ -153,5 +174,5 @@ public class XaSecureConfiguration extends Configuration {
 		
 		return ret ;
 	}
-	
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/agents-installer/src/main/java/com/xasecure/utils/install/XmlConfigChanger.java
----------------------------------------------------------------------
diff --git a/agents-installer/src/main/java/com/xasecure/utils/install/XmlConfigChanger.java
b/agents-installer/src/main/java/com/xasecure/utils/install/XmlConfigChanger.java
index e0e9910..946ef4f 100644
--- a/agents-installer/src/main/java/com/xasecure/utils/install/XmlConfigChanger.java
+++ b/agents-installer/src/main/java/com/xasecure/utils/install/XmlConfigChanger.java
@@ -175,6 +175,7 @@ public class XmlConfigChanger {
 			
 			String line = null ;
 			
+			@SuppressWarnings("unused")
 			int lineNo = 0 ;
 			
 			while ((line = reader.readLine()) != null) {
@@ -426,6 +427,8 @@ public class XmlConfigChanger {
 			FileInputStream in = new FileInputStream(propFile) ;
 			installProperties.load(in);
 		}
+		// To support environment variable, we will add all environment variables to the Properties
+		installProperties.putAll(System.getenv());
 	}
 	
 		

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/hbase-agent/conf/xasecure-audit-changes.cfg
----------------------------------------------------------------------
diff --git a/hbase-agent/conf/xasecure-audit-changes.cfg b/hbase-agent/conf/xasecure-audit-changes.cfg
index 48a8cf5..7faabe7 100644
--- a/hbase-agent/conf/xasecure-audit-changes.cfg
+++ b/hbase-agent/conf/xasecure-audit-changes.cfg
@@ -1,10 +1,10 @@
 xasecure.audit.db.is.enabled                        %XAAUDIT.DB.IS_ENABLED%             
                           mod create-if-not-exists
-xasecure.audit.jpa.javax.persistence.jdbc.url		%XAAUDIT.DB.JDBC_URL%											mod create-if-not-exists
+xasecure.audit.jpa.javax.persistence.jdbc.url		%XAAUDIT_DB_JDBC_URL%											mod create-if-not-exists
 xasecure.audit.jpa.javax.persistence.jdbc.user		%XAAUDIT.DB.USER_NAME% 											mod create-if-not-exists
 xasecure.audit.jpa.javax.persistence.jdbc.password	crypted 											mod create-if-not-exists
 xasecure.audit.repository.name						%REPOSITORY_NAME% 												mod create-if-not-exists
 xasecure.audit.credential.provider.file     		jceks://file%CREDENTIAL_PROVIDER_FILE% 			
			mod create-if-not-exists
-xasecure.audit.jpa.javax.persistence.jdbc.driver	%XAAUDIT.DB.JDBC_DRIVER% 										mod create-if-not-exists
+xasecure.audit.jpa.javax.persistence.jdbc.driver	%XAAUDIT_DB_JDBC_DRIVER% 										mod create-if-not-exists
 
 xasecure.audit.hdfs.is.enabled                                     %XAAUDIT.HDFS.IS_ENABLED%
                              mod create-if-not-exists
 xasecure.audit.hdfs.config.destination.directroy                   %XAAUDIT.HDFS.DESTINATION_DIRECTORY%
                   mod create-if-not-exists

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/hbase-agent/scripts/install.properties
----------------------------------------------------------------------
diff --git a/hbase-agent/scripts/install.properties b/hbase-agent/scripts/install.properties
index 28ab203..ede3422 100644
--- a/hbase-agent/scripts/install.properties
+++ b/hbase-agent/scripts/install.properties
@@ -47,26 +47,6 @@ XAAUDIT.DB.USER_NAME=
 XAAUDIT.DB.PASSWORD=
 
 #
-# Credential Provider File Path
-#
-# CREDENTIAL_PROVIDER_FILE=/etc/xasecure/{repoName}-credstore.jceks
-#
-
-CREDENTIAL_PROVIDER_FILE=
-
-
-#
-# POLICY CACHE FILE PATH
-# 
-# This information is used to configure the path where the policy cache is stored.
-# 
-# Example:
-# POLICY_CACHE_FILE_PATH=/home/hbase
-# 
-
-POLICY_CACHE_FILE_PATH=
-
-#
 # SSL Client Certificate Information
 #
 # Example:
@@ -94,18 +74,9 @@ SSL_TRUSTSTORE_PASSWORD=changeit
 UPDATE_XAPOLICIES_ON_GRANT_REVOKE=true
 
 #
-# do not change value of below given properties as value will be assigned by system based
on above settings.
-# Example:
-# MySQL:
-# XAAUDIT.DB.JDBC_URL=jdbc:mysql://localhost:3306/xasecure
-# XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver
-# Oracle:
-# XAAUDIT.DB.JDBC_URL=jdbc:oracle:thin:@//127.0.0.1:1521/XE
-# XAAUDIT.DB.JDBC_DRIVER=oracle.jdbc.OracleDriver
-
+# Enable DB auditing
+#
 XAAUDIT.DB.IS_ENABLED=true
-XAAUDIT.DB.JDBC_URL=jdbc:mysql://localhost:3306/xasecure
-XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver
 
 
 #

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/hdfs-agent/conf/xasecure-audit-changes.cfg
----------------------------------------------------------------------
diff --git a/hdfs-agent/conf/xasecure-audit-changes.cfg b/hdfs-agent/conf/xasecure-audit-changes.cfg
index 48a8cf5..7faabe7 100644
--- a/hdfs-agent/conf/xasecure-audit-changes.cfg
+++ b/hdfs-agent/conf/xasecure-audit-changes.cfg
@@ -1,10 +1,10 @@
 xasecure.audit.db.is.enabled                        %XAAUDIT.DB.IS_ENABLED%             
                           mod create-if-not-exists
-xasecure.audit.jpa.javax.persistence.jdbc.url		%XAAUDIT.DB.JDBC_URL%											mod create-if-not-exists
+xasecure.audit.jpa.javax.persistence.jdbc.url		%XAAUDIT_DB_JDBC_URL%											mod create-if-not-exists
 xasecure.audit.jpa.javax.persistence.jdbc.user		%XAAUDIT.DB.USER_NAME% 											mod create-if-not-exists
 xasecure.audit.jpa.javax.persistence.jdbc.password	crypted 											mod create-if-not-exists
 xasecure.audit.repository.name						%REPOSITORY_NAME% 												mod create-if-not-exists
 xasecure.audit.credential.provider.file     		jceks://file%CREDENTIAL_PROVIDER_FILE% 			
			mod create-if-not-exists
-xasecure.audit.jpa.javax.persistence.jdbc.driver	%XAAUDIT.DB.JDBC_DRIVER% 										mod create-if-not-exists
+xasecure.audit.jpa.javax.persistence.jdbc.driver	%XAAUDIT_DB_JDBC_DRIVER% 										mod create-if-not-exists
 
 xasecure.audit.hdfs.is.enabled                                     %XAAUDIT.HDFS.IS_ENABLED%
                              mod create-if-not-exists
 xasecure.audit.hdfs.config.destination.directroy                   %XAAUDIT.HDFS.DESTINATION_DIRECTORY%
                   mod create-if-not-exists

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/hdfs-agent/scripts/install.properties
----------------------------------------------------------------------
diff --git a/hdfs-agent/scripts/install.properties b/hdfs-agent/scripts/install.properties
index 2cda67c..93afcd3 100644
--- a/hdfs-agent/scripts/install.properties
+++ b/hdfs-agent/scripts/install.properties
@@ -49,26 +49,6 @@ XAAUDIT.DB.USER_NAME=
 XAAUDIT.DB.PASSWORD=
 
 #
-# Credential Provider File Path
-#
-# CREDENTIAL_PROVIDER_FILE=/etc/xasecure/{repoName}-credstore.jceks
-#
-
-CREDENTIAL_PROVIDER_FILE=
-
-
-#
-# POLICY CACHE FILE PATH
-# 
-# This information is used to configure the path where the policy cache is stored.
-# 
-# Example:
-# POLICY_CACHE_FILE_PATH=/home/hdfs
-# 
-
-POLICY_CACHE_FILE_PATH=
-
-#
 # SSL Client Certificate Information
 #
 # Example:
@@ -87,19 +67,9 @@ SSL_TRUSTSTORE_FILE_PATH=cacert
 SSL_TRUSTSTORE_PASSWORD=changeit
 
 #
-# do not change value of below given properties as value will be assigned by system based
on above settings.
-# Example:
-# MySQL:
-# XAAUDIT.DB.JDBC_URL=jdbc:mysql://localhost:3306/xasecure
-# XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver
-# Oracle:
-# XAAUDIT.DB.JDBC_URL=jdbc:oracle:thin:@//127.0.0.1:1521/XE
-# XAAUDIT.DB.JDBC_DRIVER=oracle.jdbc.OracleDriver
-
+# Enable DB auditing
+#
 XAAUDIT.DB.IS_ENABLED=true
-XAAUDIT.DB.JDBC_URL=jdbc:mysql://localhost:3306/xasecure
-XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver
-
 
 #
 #  Audit to HDFS

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/hive-agent/conf/xasecure-audit-changes.cfg
----------------------------------------------------------------------
diff --git a/hive-agent/conf/xasecure-audit-changes.cfg b/hive-agent/conf/xasecure-audit-changes.cfg
index e8547c2..a86b304 100644
--- a/hive-agent/conf/xasecure-audit-changes.cfg
+++ b/hive-agent/conf/xasecure-audit-changes.cfg
@@ -1,10 +1,10 @@
 xasecure.audit.db.is.enabled                        %XAAUDIT.DB.IS_ENABLED%             
                           mod create-if-not-exists
-xasecure.audit.jpa.javax.persistence.jdbc.url		%XAAUDIT.DB.JDBC_URL%											mod create-if-not-exists
+xasecure.audit.jpa.javax.persistence.jdbc.url		%XAAUDIT_DB_JDBC_URL%											mod create-if-not-exists
 xasecure.audit.jpa.javax.persistence.jdbc.user		%XAAUDIT.DB.USER_NAME% 											mod create-if-not-exists
 xasecure.audit.jpa.javax.persistence.jdbc.password	crypted 														mod create-if-not-exists
 xasecure.audit.repository.name						%REPOSITORY_NAME% 												mod create-if-not-exists
 xasecure.audit.credential.provider.file     		jceks://file%CREDENTIAL_PROVIDER_FILE% 			
			mod create-if-not-exists
-xasecure.audit.jpa.javax.persistence.jdbc.driver	%XAAUDIT.DB.JDBC_DRIVER% 										mod create-if-not-exists
+xasecure.audit.jpa.javax.persistence.jdbc.driver	%XAAUDIT_DB_JDBC_DRIVER% 										mod create-if-not-exists
 
 xasecure.audit.hdfs.is.enabled                                     %XAAUDIT.HDFS.IS_ENABLED%
                              mod create-if-not-exists
 xasecure.audit.hdfs.config.destination.directroy                   %XAAUDIT.HDFS.DESTINATION_DIRECTORY%
                   mod create-if-not-exists

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/hive-agent/scripts/install.properties
----------------------------------------------------------------------
diff --git a/hive-agent/scripts/install.properties b/hive-agent/scripts/install.properties
index bfda46b..985dcc5 100644
--- a/hive-agent/scripts/install.properties
+++ b/hive-agent/scripts/install.properties
@@ -46,26 +46,6 @@ XAAUDIT.DB.DATABASE_NAME=
 XAAUDIT.DB.USER_NAME=
 XAAUDIT.DB.PASSWORD=
 
-
-#
-# POLICY CACHE FILE PATH
-# 
-# This information is used to configure the path where the policy cache is stored.
-# 
-# Example:
-# POLICY_CACHE_FILE_PATH=/home/hive
-# 
-
-POLICY_CACHE_FILE_PATH=
-
-#
-# Credential Provider File Path
-#
-# CREDENTIAL_PROVIDER_FILE=/etc/xasecure/{repoName}-credstore.jceks
-#
-
-CREDENTIAL_PROVIDER_FILE=
-
 #
 # SSL Client Certificate Information
 #
@@ -94,19 +74,9 @@ SSL_TRUSTSTORE_PASSWORD=changeit
 UPDATE_XAPOLICIES_ON_GRANT_REVOKE=true
 
 #
-# do not change value of below given properties as value will be assigned by system based
on above settings.
-# Example:
-# MySQL:
-# XAAUDIT.DB.JDBC_URL=jdbc:mysql://localhost:3306/xasecure
-# XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver
-# Oracle:
-# XAAUDIT.DB.JDBC_URL=jdbc:oracle:thin:@//127.0.0.1:1521/XE
-# XAAUDIT.DB.JDBC_DRIVER=oracle.jdbc.OracleDriver
-
+# Enable DB auditing
+#
 XAAUDIT.DB.IS_ENABLED=true
-XAAUDIT.DB.JDBC_URL=jdbc:mysql://localhost:3306/xasecure
-XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver
-
 
 #
 #  Audit to HDFS

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/knox-agent/conf/xasecure-audit-changes.cfg
----------------------------------------------------------------------
diff --git a/knox-agent/conf/xasecure-audit-changes.cfg b/knox-agent/conf/xasecure-audit-changes.cfg
index 02e6fb1..5a9e750 100644
--- a/knox-agent/conf/xasecure-audit-changes.cfg
+++ b/knox-agent/conf/xasecure-audit-changes.cfg
@@ -1,9 +1,9 @@
 xasecure.audit.db.is.enabled                        %XAAUDIT.DB.IS_ENABLED%             
                           mod create-if-not-exists
-xasecure.audit.jpa.javax.persistence.jdbc.url		%XAAUDIT.DB.JDBC_URL%											mod create-if-not-exists
+xasecure.audit.jpa.javax.persistence.jdbc.url		%XAAUDIT_DB_JDBC_URL%											mod create-if-not-exists
 xasecure.audit.jpa.javax.persistence.jdbc.user		%XAAUDIT.DB.USER_NAME% 											mod create-if-not-exists
 xasecure.audit.credential.provider.file jceks://file%CREDENTIAL_PROVIDER_FILE% mod create-if-not-exists
 xasecure.audit.repository.name	%REPOSITORY_NAME% mod create-if-not-exists
-xasecure.audit.jpa.javax.persistence.jdbc.driver	%XAAUDIT.DB.JDBC_DRIVER% 										mod create-if-not-exists
+xasecure.audit.jpa.javax.persistence.jdbc.driver	%XAAUDIT_DB_JDBC_DRIVER% 										mod create-if-not-exists
 
 xasecure.audit.hdfs.is.enabled                                     %XAAUDIT.HDFS.IS_ENABLED%
                              mod create-if-not-exists
 xasecure.audit.hdfs.config.destination.directroy                   %XAAUDIT.HDFS.DESTINATION_DIRECTORY%
                   mod create-if-not-exists

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/knox-agent/scripts/install.properties
----------------------------------------------------------------------
diff --git a/knox-agent/scripts/install.properties b/knox-agent/scripts/install.properties
index fabd95f..65023fb 100644
--- a/knox-agent/scripts/install.properties
+++ b/knox-agent/scripts/install.properties
@@ -33,16 +33,6 @@ REPOSITORY_NAME=knoxdev
 KNOX_HOME=/usr/lib/knox
 
 
-#
-# Credential Provider File Path
-#
-# CREDENTIAL_PROVIDER_FILE=/usr/lib/knox/conf/{repoName}-credstore.jceks
-#
-
-CREDENTIAL_PROVIDER_FILE=/usr/lib/knox/conf/xasecure-knoxdev-credstore.jceks
-
-#
-
 # AUDIT DB Configuration
 # 
 #  This information should match with the one you specified during the PolicyManager Installation
@@ -80,19 +70,9 @@ SSL_TRUSTSTORE_FILE_PATH=cacert
 SSL_TRUSTSTORE_PASSWORD=changeit
 
 #
-# do not change value of below given properties as value will be assigned by system based
on above settings.
-# Example:
-# MySQL:
-# XAAUDIT.DB.JDBC_URL=jdbc:mysql://localhost:3306/xasecure
-# XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver
-# Oracle:
-# XAAUDIT.DB.JDBC_URL=jdbc:oracle:thin:@//127.0.0.1:1521/XE
-# XAAUDIT.DB.JDBC_DRIVER=oracle.jdbc.OracleDriver
-
+# Enable DB auditing
+#
 XAAUDIT.DB.IS_ENABLED=true
-XAAUDIT.DB.JDBC_URL=jdbc:mysql://localhost:3306/xasecure
-XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver
-
 
 #
 #  Audit to HDFS

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/security-admin/.settings/org.eclipse.wst.common.component
----------------------------------------------------------------------
diff --git a/security-admin/.settings/org.eclipse.wst.common.component b/security-admin/.settings/org.eclipse.wst.common.component
index 9c26ea8..cf0a506 100644
--- a/security-admin/.settings/org.eclipse.wst.common.component
+++ b/security-admin/.settings/org.eclipse.wst.common.component
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="security-admin-web">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="lookup-client-0.1.0.jar" deploy-path="/WEB-INF/lib"
handle="module:/resource/lookup-client/lookup-client">
+        <dependent-module archiveName="lookup-client-0.4.0.jar" deploy-path="/WEB-INF/lib"
handle="module:/resource/lookup-client/lookup-client">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="unixauthclient-0.1.0.jar" deploy-path="/WEB-INF/lib"
handle="module:/resource/unixauthclient/unixauthclient">
+        <dependent-module archiveName="unixauthclient-0.4.0.jar" deploy-path="/WEB-INF/lib"
handle="module:/resource/unixauthclient/unixauthclient">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="context-root" value="security-admin-web"/>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/storm-agent/conf/xasecure-audit-changes.cfg
----------------------------------------------------------------------
diff --git a/storm-agent/conf/xasecure-audit-changes.cfg b/storm-agent/conf/xasecure-audit-changes.cfg
index bfbc90f..6cfe59d 100644
--- a/storm-agent/conf/xasecure-audit-changes.cfg
+++ b/storm-agent/conf/xasecure-audit-changes.cfg
@@ -1,10 +1,10 @@
 xasecure.audit.db.is.enabled                        %XAAUDIT.DB.IS_ENABLED%             
                           mod create-if-not-exists
-xasecure.audit.jpa.javax.persistence.jdbc.url		%XAAUDIT.DB.JDBC_URL%											mod create-if-not-exists
+xasecure.audit.jpa.javax.persistence.jdbc.url		%XAAUDIT_DB_JDBC_URL%											mod create-if-not-exists
 xasecure.audit.jpa.javax.persistence.jdbc.user		%XAAUDIT.DB.USER_NAME% 											mod create-if-not-exists
 xasecure.audit.jpa.javax.persistence.jdbc.password	crypted	 														mod create-if-not-exists
 xasecure.audit.repository.name						%REPOSITORY_NAME% 												mod create-if-not-exists
 xasecure.audit.credential.provider.file     		jceks://file%CREDENTIAL_PROVIDER_FILE% 			
			mod create-if-not-exists
-xasecure.audit.jpa.javax.persistence.jdbc.driver	%XAAUDIT.DB.JDBC_DRIVER% 										mod create-if-not-exists
+xasecure.audit.jpa.javax.persistence.jdbc.driver	%XAAUDIT_DB_JDBC_DRIVER% 										mod create-if-not-exists
 
 xasecure.audit.hdfs.is.enabled                                     %XAAUDIT.HDFS.IS_ENABLED%
                              mod create-if-not-exists
 xasecure.audit.hdfs.config.destination.directroy                   %XAAUDIT.HDFS.DESTINATION_DIRECTORY%
                   mod create-if-not-exists

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/548aa516/storm-agent/scripts/install.properties
----------------------------------------------------------------------
diff --git a/storm-agent/scripts/install.properties b/storm-agent/scripts/install.properties
index 4e66555..5223ce5 100644
--- a/storm-agent/scripts/install.properties
+++ b/storm-agent/scripts/install.properties
@@ -46,26 +46,6 @@ XAAUDIT.DB.DATABASE_NAME=
 XAAUDIT.DB.USER_NAME=
 XAAUDIT.DB.PASSWORD=
 
-
-#
-# POLICY CACHE FILE PATH
-# 
-# This information is used to configure the path where the policy cache is stored.
-# 
-# Example:
-# POLICY_CACHE_FILE_PATH=/home/storm
-# 
-
-POLICY_CACHE_FILE_PATH=
-
-#
-# Credential Provider File Path
-#
-# CREDENTIAL_PROVIDER_FILE=/etc/xasecure/{repoName}-credstore.jceks
-#
-
-CREDENTIAL_PROVIDER_FILE=
-
 #
 # SSL Client Certificate Information
 #
@@ -84,19 +64,10 @@ SSL_KEYSTORE_PASSWORD=myKeyFilePassword
 SSL_TRUSTSTORE_FILE_PATH=cacert
 SSL_TRUSTSTORE_PASSWORD=changeit
 
-# do not change value of below given properties as value will be assigned by system based
on above settings.
-# Example:
-# MySQL:
-# XAAUDIT.DB.JDBC_URL=jdbc:mysql://localhost:3306/xasecure
-# XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver
-# Oracle:
-# XAAUDIT.DB.JDBC_URL=jdbc:oracle:thin:@//127.0.0.1:1521/XE
-# XAAUDIT.DB.JDBC_DRIVER=oracle.jdbc.OracleDriver
-
+#
+# Enable DB auditing
+#
 XAAUDIT.DB.IS_ENABLED=true
-XAAUDIT.DB.JDBC_URL=jdbc:mysql://localhost:3306/xasecure
-XAAUDIT.DB.JDBC_DRIVER=com.mysql.jdbc.Driver
-
 
 #
 #  Audit to HDFS


Mime
View raw message