You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sn...@apache.org on 2015/04/29 14:27:56 UTC
incubator-ranger git commit: RANGER-438 : Fix KMS installation after
ranger-site changes
Repository: incubator-ranger
Updated Branches:
refs/heads/master 91d1e1374 -> 3efc0df82
RANGER-438 : Fix KMS installation after ranger-site changes
Signed-off-by: sneethiraj <sn...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/3efc0df8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3efc0df8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3efc0df8
Branch: refs/heads/master
Commit: 3efc0df82150e4c048af08c0911c1db2eab06334
Parents: 91d1e13
Author: Gautam Borad <gb...@gmail.com>
Authored: Wed Apr 29 17:27:27 2015 +0530
Committer: sneethiraj <sn...@apache.org>
Committed: Wed Apr 29 08:01:35 2015 -0400
----------------------------------------------------------------------
kms/config/webserver/kms_webserver.properties | 65 --------------------
kms/config/webserver/ranger-kms-site.xml | 41 ++++++++++++
kms/scripts/ranger-kms | 3 +-
.../main/webapp/META-INF/applicationContext.xml | 2 +-
unixauthservice/scripts/setup.py | 2 +-
5 files changed, 45 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3efc0df8/kms/config/webserver/kms_webserver.properties
----------------------------------------------------------------------
diff --git a/kms/config/webserver/kms_webserver.properties b/kms/config/webserver/kms_webserver.properties
deleted file mode 100644
index 0051dcd..0000000
--- a/kms/config/webserver/kms_webserver.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Service Information
-#
-service.host=localhost
-http.service.port=9292
-service.shutdownPort=7085
-service.shutdownCommand=SHUTDOWN
-service.waitTimeForForceShutdownInSeconds=0
-
-#
-# SSL Connector Information
-#
-#https.service.port=7181
-https.attrib.SSLEnabled=true
-https.attrib.sslProtocol=TLS
-https.attrib.clientAuth=false
-https.attrib.keyAlias=rangerkms
-https.attrib.keystorePass=rangerkms
-https.attrib.keystoreFile=./keys/server.jks
-
-#
-# Access Log Information
-#
-accesslog.dateformat=yyyy-MM-dd
-accesslog.pattern=%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"
-
-
-#
-# Web Application root folder
-#
-xa.webapp.contextName=/kms
-xa.webapp.dir=./webapp
-
-#
-# Values required for setup script
-#
-realScriptPath=`readlink -f $0`
-realScriptDir=`dirname $realScriptPath`
-RANGER_KMS_DIR=`(cd $realScriptDir/..; pwd)`
-RANGER_KMS_EWS_DIR=${RANGER_KMS_DIR}/ews
-
-app_home=${RANGER_KMS_EWS_DIR}/webapp
-SQL_CONNECTOR_JAR=/usr/share/java/mysql-connector-java.jar
-PYTHON_COMMAND_INVOKER="python"
-JAVA_VERSION_REQUIRED="1.7"
-#
-# Log file path
-#
-LOGFILE=${RANGER_KMS_DIR}/logfile
-LOGFILES="$LOGFILE"
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3efc0df8/kms/config/webserver/ranger-kms-site.xml
----------------------------------------------------------------------
diff --git a/kms/config/webserver/ranger-kms-site.xml b/kms/config/webserver/ranger-kms-site.xml
new file mode 100644
index 0000000..81f3f17
--- /dev/null
+++ b/kms/config/webserver/ranger-kms-site.xml
@@ -0,0 +1,41 @@
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. See accompanying LICENSE file.
+-->
+
+
+<configuration>
+ <property>
+ <name>ranger.service.host</name>
+ <value>localhost</value>
+ </property>
+
+ <property>
+ <name>ranger.service.http.port</name>
+ <value>9292</value>
+ </property>
+
+ <property>
+ <name>ranger.service.shutdown.port</name>
+ <value>7085</value>
+ </property>
+
+ <property>
+ <name>ranger.contextName</name>
+ <value>/kms</value>
+ </property>
+
+ <property>
+ <name>xa.webapp.dir</name>
+ <value>./webapp</value>
+ </property>
+</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3efc0df8/kms/scripts/ranger-kms
----------------------------------------------------------------------
diff --git a/kms/scripts/ranger-kms b/kms/scripts/ranger-kms
index 07c2910..461a0c4 100755
--- a/kms/scripts/ranger-kms
+++ b/kms/scripts/ranger-kms
@@ -57,7 +57,8 @@ START_CLASS_NAME="org.apache.ranger.server.tomcat.EmbeddedServer"
STOP_CLASS_NAME="org.apache.ranger.server.tomcat.StopEmbeddedServer"
-KMS_CONFIG_FILENAME=kms_webserver.properties
+#KMS_CONFIG_FILENAME=kms_webserver.properties
+KMS_CONFIG_FILENAME=ranger-kms-site.xml
TOMCAT_LOG_DIR=/var/log/ranger/kms
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3efc0df8/security-admin/src/main/webapp/META-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/META-INF/applicationContext.xml b/security-admin/src/main/webapp/META-INF/applicationContext.xml
index f96a461..c1a9387 100644
--- a/security-admin/src/main/webapp/META-INF/applicationContext.xml
+++ b/security-admin/src/main/webapp/META-INF/applicationContext.xml
@@ -179,7 +179,7 @@ http://www.springframework.org/schema/util/spring-util.xsd">
<value>${ranger.jpa.audit.jdbc.url}</value>
</property>
<property name="user">
- <value>${ranger.jpa.audit.jdbc.user}</value>
+ <value>${ranger.jpa.jdbc.user}</value>
</property>
<property name="password">
<value>${ranger.jpa.jdbc.password}</value>
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3efc0df8/unixauthservice/scripts/setup.py
----------------------------------------------------------------------
diff --git a/unixauthservice/scripts/setup.py b/unixauthservice/scripts/setup.py
index 4cb79ff..9a9e525 100755
--- a/unixauthservice/scripts/setup.py
+++ b/unixauthservice/scripts/setup.py
@@ -58,7 +58,7 @@ PROP2ALIASMAP = { 'ranger.usersync.ldap.ldapbindpassword':'ranger.usersync.ldap.
installTemplateDirName = join(installPropDirName,'templates')
confDistDirName = join(installPropDirName, confDistBaseDirName)
-ugsyncLogFolderName = join(logFolderName, 'ugsync')
+ugsyncLogFolderName = join(logFolderName, 'usersync')
nativeAuthFolderName = join(installPropDirName, 'native')
nativeAuthProgramName = join(nativeAuthFolderName, 'credValidator.uexe')
usersyncBaseDirFullName = join(rangerBaseDirName, usersyncBaseDirName)