Repository: incubator-ranger Updated Branches: refs/heads/master f326e5efd -> 5526e60c7
RANGER-795: Ranger admin does not start when SSL is enabled Change-Id: I08af06b29ac6dae6d68e6e57d6ce1019a55612f7 Signed-off-by: sneethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/5526e60c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/5526e60c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/5526e60c Branch: refs/heads/master Commit: 5526e60c7055a66b033d66bd337272a0b8f130bf Parents: f326e5e Author: arshad.mohammad <[email protected]> Authored: Thu Dec 24 13:05:19 2015 +0530 Committer: sneethiraj <[email protected]> Committed: Mon Jan 4 18:33:51 2016 -0500 ---------------------------------------------------------------------- .../apache/ranger/server/tomcat/EmbeddedServer.java | 13 +++++++++++-- security-admin/scripts/ranger-admin-site-template.xml | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/5526e60c/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java ---------------------------------------------------------------------- diff --git a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java index e259d9e..fbd61f0 100644 --- a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java +++ b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java @@ -105,7 +105,7 @@ public class EmbeddedServer { ssl.setAttribute("clientAuth", getConfig("ranger.service.https.attrib.clientAuth", "false")); ssl.setAttribute("keyAlias", getConfig("ranger.service.https.attrib.keystore.keyalias")); ssl.setAttribute("keystorePass", getConfig("ranger.service.https.attrib.keystore.pass")); - ssl.setAttribute("keystoreFile", getConfig("ranger.https.attrib.keystore.file")); + ssl.setAttribute("keystoreFile", getKeystoreFile()); String enabledProtocols = "SSLv2Hello, TLSv1, TLSv1.1, TLSv1.2"; ssl.setAttribute("sslEnabledProtocols", enabledProtocols); @@ -203,7 +203,16 @@ public class EmbeddedServer { e.printStackTrace(); } } - + + private String getKeystoreFile() { + String keystoreFile=getConfig("ranger.service.https.attrib.keystore.file"); + if (keystoreFile == null || keystoreFile.trim().isEmpty()) { + // new property not configured, lets use the old property + keystoreFile = getConfig("ranger.https.attrib.keystore.file") ; + } + return keystoreFile; + } + protected String getConfig(String key) { String value = serverConfigProperties.getProperty(key); if (value == null || value.trim().isEmpty()) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/5526e60c/security-admin/scripts/ranger-admin-site-template.xml ---------------------------------------------------------------------- diff --git a/security-admin/scripts/ranger-admin-site-template.xml b/security-admin/scripts/ranger-admin-site-template.xml index 11adbe9..af345cf 100644 --- a/security-admin/scripts/ranger-admin-site-template.xml +++ b/security-admin/scripts/ranger-admin-site-template.xml @@ -61,7 +61,7 @@ <value></value> </property> <property> - <name>ranger.https.attrib.keystore.file</name> + <name>ranger.service.https.attrib.keystore.file</name> <value></value> </property> <property>
