Repository: incubator-ranger Updated Branches: refs/heads/master 7c6d268f3 -> dd547b8bb
RANGER-445: kms deployment issues are fixed Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/dd547b8b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/dd547b8b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/dd547b8b Branch: refs/heads/master Commit: dd547b8bbf0a9a9a09851ac6b2343743591e9334 Parents: 7c6d268 Author: sneethiraj <[email protected]> Authored: Fri May 1 14:39:39 2015 -0400 Committer: sneethiraj <[email protected]> Committed: Fri May 1 14:39:39 2015 -0400 ---------------------------------------------------------------------- kms/pom.xml | 6 +++--- kms/scripts/setup.sh | 20 ++++++++++++++++---- .../hadoop/crypto/key/kms/server/KMSWebApp.java | 1 + unixauthservice/scripts/setup.py | 3 ++- 4 files changed, 22 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/dd547b8b/kms/pom.xml ---------------------------------------------------------------------- diff --git a/kms/pom.xml b/kms/pom.xml index 62ececf..183359e 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -152,13 +152,13 @@ <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> - <version>${jersey-server.version}</version> + <version>${sun-jersey-bundle.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-server</artifactId> - <version>${jersey-server.version}</version> + <version>${sun-jersey-bundle.version}</version> <scope>compile</scope> </dependency> <dependency> @@ -374,7 +374,7 @@ <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-json</artifactId> - <version>${jersey-server.version}</version> + <version>${sun-jersey-bundle.version}</version> </dependency> <dependency> <groupId>org.codehaus.jettison</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/dd547b8b/kms/scripts/setup.sh ---------------------------------------------------------------------- diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh index 29abbab..0abfd2b 100755 --- a/kms/scripts/setup.sh +++ b/kms/scripts/setup.sh @@ -270,10 +270,16 @@ copy_db_connector(){ log "Creating ${libfolder}" mkdir -p ${libfolder} fi - log "[I] Copying ${DB_FLAVOR} Connector to ${libfolder} "; - cp -f $SQL_CONNECTOR_JAR ${libfolder} - check_ret_status $? "Copying ${DB_FLAVOR} Connector to ${libfolder} failed" - log "[I] Copying ${DB_FLAVOR} Connector to ${libfolder} DONE"; + fn=`basename ${SQL_CONNECTOR_JAR}` + if [ ! -f ${libfolder}/${fn} ] + then + log "[I] Copying ${DB_FLAVOR} Connector to ${libfolder} "; + cp -f $SQL_CONNECTOR_JAR ${libfolder} + check_ret_status $? "Copying ${DB_FLAVOR} Connector to ${libfolder} failed" + log "[I] Copying ${DB_FLAVOR} Connector to ${libfolder} DONE"; + else + log "[I] Using already existing DB connector: ${libfolder}/${fn} "; + fi } setup_kms(){ @@ -550,6 +556,12 @@ setup_install_files(){ chmod ug+rx /usr/bin/ranger-kms-services.sh fi + if [ ! \( -e ${INSTALL_DIR}/ranger-kms-services.sh \) ] + then + ln -sf ${INSTALL_DIR}/ranger-kms-initd ${INSTALL_DIR}/ranger-kms-services.sh + chmod ug+rx ${INSTALL_DIR}/ranger-kms-services.sh + fi + if [ ! -d /var/log/ranger/kms ] then mkdir -p /var/log/ranger/kms http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/dd547b8b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java index 403c310..65c80ad 100755 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java @@ -241,6 +241,7 @@ public class KMSWebApp implements ServletContextListener { keyAcl = ReflectionUtils.newInstance(cls, kmsConf); } } catch (Exception e) { + LOG.error("Unable to getAcls with an exception", e) ; throw new IOException(e.getMessage()); } return keyAcl; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/dd547b8b/unixauthservice/scripts/setup.py ---------------------------------------------------------------------- diff --git a/unixauthservice/scripts/setup.py b/unixauthservice/scripts/setup.py index dbc209f..f83d906 100755 --- a/unixauthservice/scripts/setup.py +++ b/unixauthservice/scripts/setup.py @@ -374,7 +374,8 @@ def main(): updateProppertyInJCKSFile(cryptPath,aliasName,keyPassword) else: updateProppertyInJCKSFile(cryptPath,aliasName," ") - + + os.chown(cryptPath,ownerId,groupId) fixPermList = [ ".", usersyncBaseDirName, confFolderName, certFolderName ]
