This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.2
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.2 by this push:
new 0e9f58f RANGER-3061: fixed incorrect plugin config for
ranger-policymgr-ssl.xml location
0e9f58f is described below
commit 0e9f58feb50b6a60f28c2d6c49245834771da4fa
Author: gaozhan.ding <[email protected]>
AuthorDate: Wed Oct 28 15:50:44 2020 +0800
RANGER-3061: fixed incorrect plugin config for ranger-policymgr-ssl.xml
location
Signed-off-by: Madhan Neethiraj <[email protected]>
(cherry picked from commit cb392acc2e62cf6c5e0ba3a8c0215096c3facfda)
---
hdfs-agent/conf/ranger-hdfs-security-changes.cfg | 2 +-
hive-agent/conf/ranger-hive-security-changes.cfg | 2 +-
kms/scripts/install.properties | 3 +++
knox-agent/conf/ranger-knox-security-changes.cfg | 2 +-
plugin-atlas/conf/ranger-atlas-security-changes.cfg | 2 +-
plugin-elasticsearch/conf/ranger-elasticsearch-security-changes.cfg | 2 +-
plugin-kafka/conf/ranger-kafka-security-changes.cfg | 2 +-
plugin-kms/conf/ranger-kms-security-changes.cfg | 2 +-
plugin-kylin/conf/ranger-kylin-security-changes.cfg | 2 +-
plugin-ozone/conf/ranger-ozone-security-changes.cfg | 2 +-
plugin-presto/conf/ranger-presto-security-changes.cfg | 2 +-
plugin-solr/conf/ranger-solr-security-changes.cfg | 2 +-
plugin-sqoop/conf/ranger-sqoop-security-changes.cfg | 2 +-
plugin-yarn/conf/ranger-yarn-security-changes.cfg | 2 +-
storm-agent/conf/ranger-storm-security-changes.cfg | 2 +-
15 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/hdfs-agent/conf/ranger-hdfs-security-changes.cfg
b/hdfs-agent/conf/ranger-hdfs-security-changes.cfg
index 5639c17..00ff580 100644
--- a/hdfs-agent/conf/ranger-hdfs-security-changes.cfg
+++ b/hdfs-agent/conf/ranger-hdfs-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.hdfs.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.hdfs.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.hdfs.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.hdfs.policy.rest.ssl.config.file
/etc/hadoop/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.hdfs.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/etc/hadoop/ranger-policymgr-ssl.xml mod
create-if-not-exists
ranger.plugin.hdfs.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.hdfs.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.plugin.hdfs.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
diff --git a/hive-agent/conf/ranger-hive-security-changes.cfg
b/hive-agent/conf/ranger-hive-security-changes.cfg
index 0e8d0d4..6f2b840 100644
--- a/hive-agent/conf/ranger-hive-security-changes.cfg
+++ b/hive-agent/conf/ranger-hive-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.hive.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.hive.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.hive.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.hive.policy.rest.ssl.config.file
/etc/hive/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.hive.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/conf/ranger-policymgr-ssl.xml mod
create-if-not-exists
ranger.plugin.hive.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.hive.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.plugin.hive.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
diff --git a/kms/scripts/install.properties b/kms/scripts/install.properties
index e33192b..814edb3 100755
--- a/kms/scripts/install.properties
+++ b/kms/scripts/install.properties
@@ -75,6 +75,9 @@ ranger_kms_https_keystore_file=
ranger_kms_https_keystore_keyalias=rangerkms
ranger_kms_https_keystore_password=
+#------------------------- RANGER KMS Install Dir ------------------
+COMPONENT_INSTALL_DIR_NAME=
+
#------------------------- RANGER KMS Master Key Crypt Key ------------------
KMS_MASTER_KEY_PASSWD=Str0ngPassw0rd
diff --git a/knox-agent/conf/ranger-knox-security-changes.cfg
b/knox-agent/conf/ranger-knox-security-changes.cfg
index db702e5..9562faf 100644
--- a/knox-agent/conf/ranger-knox-security-changes.cfg
+++ b/knox-agent/conf/ranger-knox-security-changes.cfg
@@ -19,7 +19,7 @@
ranger.plugin.knox.service.name %REPOSITORY_NAME%
mod create-if-not-exists
ranger.plugin.knox.policy.source.impl
org.apache.ranger.admin.client.RangerAdminJersey2RESTClient mod
create-if-not-exists
ranger.plugin.knox.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.knox.policy.rest.ssl.config.file
/etc/knox/conf/ranger-policymgr-ssl.xml mod
create-if-not-exists
+ranger.plugin.knox.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/conf/ranger-policymgr-ssl.xml
mod create-if-not-exists
ranger.plugin.knox.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.knox.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.plugin.knox.policy.rest.client.connection.timeoutMs 120000
mod
create-if-not-exists
diff --git a/plugin-atlas/conf/ranger-atlas-security-changes.cfg
b/plugin-atlas/conf/ranger-atlas-security-changes.cfg
index 08790b9..6b7351f 100644
--- a/plugin-atlas/conf/ranger-atlas-security-changes.cfg
+++ b/plugin-atlas/conf/ranger-atlas-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.atlas.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.atlas.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.atlas.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.atlas.policy.rest.ssl.config.file
/etc/atlas/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.atlas.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/conf/ranger-policymgr-ssl.xml mod
create-if-not-exists
ranger.plugin.atlas.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.atlas.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.plugin.atlas.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
diff --git
a/plugin-elasticsearch/conf/ranger-elasticsearch-security-changes.cfg
b/plugin-elasticsearch/conf/ranger-elasticsearch-security-changes.cfg
index 5b0deae..bfff296 100644
--- a/plugin-elasticsearch/conf/ranger-elasticsearch-security-changes.cfg
+++ b/plugin-elasticsearch/conf/ranger-elasticsearch-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.elasticsearch.service.name %REPOSITORY_NAME%
mod create-if-not-exi
ranger.plugin.elasticsearch.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.elasticsearch.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.elasticsearch.policy.rest.ssl.config.file
/etc/hadoop/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.elasticsearch.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/config/ranger-elasticsearch-plugin/ranger-policymgr-ssl.xml
mod create-if-not-exists
ranger.plugin.elasticsearch.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.elasticsearch.policy.cache.dir
%POLICY_CACHE_FILE_PATH% mod create-if-not-exists
ranger.plugin.elasticsearch.policy.rest.client.connection.timeoutMs
120000 mod create-if-not-exists
diff --git a/plugin-kafka/conf/ranger-kafka-security-changes.cfg
b/plugin-kafka/conf/ranger-kafka-security-changes.cfg
index a43eb23..7eb98df 100644
--- a/plugin-kafka/conf/ranger-kafka-security-changes.cfg
+++ b/plugin-kafka/conf/ranger-kafka-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.kafka.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.kafka.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.kafka.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.kafka.policy.rest.ssl.config.file
/etc/kafka/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.kafka.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/config/ranger-policymgr-ssl.xml mod
create-if-not-exists
ranger.plugin.kafka.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.kafka.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
diff --git a/plugin-kms/conf/ranger-kms-security-changes.cfg
b/plugin-kms/conf/ranger-kms-security-changes.cfg
index f4779ac..c9726ae 100644
--- a/plugin-kms/conf/ranger-kms-security-changes.cfg
+++ b/plugin-kms/conf/ranger-kms-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.kms.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.kms.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.kms.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.kms.policy.rest.ssl.config.file
/etc/kms/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.kms.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/ews/webapp/WEB-INF/classes/conf/ranger-policymgr-ssl.xml
mod create-if-not-exists
ranger.plugin.kms.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.kms.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.plugin.kms.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
diff --git a/plugin-kylin/conf/ranger-kylin-security-changes.cfg
b/plugin-kylin/conf/ranger-kylin-security-changes.cfg
index e6cc1f9..abffd71 100644
--- a/plugin-kylin/conf/ranger-kylin-security-changes.cfg
+++ b/plugin-kylin/conf/ranger-kylin-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.kylin.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.kylin.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.kylin.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.kylin.policy.rest.ssl.config.file
/etc/hadoop/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.kylin.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/conf/ranger-policymgr-ssl.xml mod
create-if-not-exists
ranger.plugin.kylin.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.kylin.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.plugin.kylin.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
diff --git a/plugin-ozone/conf/ranger-ozone-security-changes.cfg
b/plugin-ozone/conf/ranger-ozone-security-changes.cfg
index e91e7fd..30eae3e 100644
--- a/plugin-ozone/conf/ranger-ozone-security-changes.cfg
+++ b/plugin-ozone/conf/ranger-ozone-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.ozone.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.ozone.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.ozone.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.ozone.policy.rest.ssl.config.file
/etc/ozone/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.ozone.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/conf/ranger-policymgr-ssl.xml mod
create-if-not-exists
ranger.plugin.ozone.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.ozone.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
diff --git a/plugin-presto/conf/ranger-presto-security-changes.cfg
b/plugin-presto/conf/ranger-presto-security-changes.cfg
index 15fc7fd..5a89cfa 100644
--- a/plugin-presto/conf/ranger-presto-security-changes.cfg
+++ b/plugin-presto/conf/ranger-presto-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.presto.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.presto.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.presto.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.presto.policy.rest.ssl.config.file
/etc/hadoop/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.presto.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/etc/ranger-policymgr-ssl.xml mod
create-if-not-exists
ranger.plugin.presto.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.presto.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.plugin.presto.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
diff --git a/plugin-solr/conf/ranger-solr-security-changes.cfg
b/plugin-solr/conf/ranger-solr-security-changes.cfg
index 7ab518a..a0622cd 100644
--- a/plugin-solr/conf/ranger-solr-security-changes.cfg
+++ b/plugin-solr/conf/ranger-solr-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.solr.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.solr.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.solr.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.solr.policy.rest.ssl.config.file
/etc/solr/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.solr.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/resources/ranger-policymgr-ssl.xml mod
create-if-not-exists
ranger.plugin.solr.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.solr.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.plugin.solr.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
diff --git a/plugin-sqoop/conf/ranger-sqoop-security-changes.cfg
b/plugin-sqoop/conf/ranger-sqoop-security-changes.cfg
index fadca54..099693c 100644
--- a/plugin-sqoop/conf/ranger-sqoop-security-changes.cfg
+++ b/plugin-sqoop/conf/ranger-sqoop-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.sqoop.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.sqoop.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.sqoop.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.sqoop.policy.rest.ssl.config.file
/etc/hadoop/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.sqoop.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/conf/ranger-policymgr-ssl.xml mod
create-if-not-exists
ranger.plugin.sqoop.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.sqoop.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.plugin.sqoop.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
diff --git a/plugin-yarn/conf/ranger-yarn-security-changes.cfg
b/plugin-yarn/conf/ranger-yarn-security-changes.cfg
index d1c7308..b788128 100644
--- a/plugin-yarn/conf/ranger-yarn-security-changes.cfg
+++ b/plugin-yarn/conf/ranger-yarn-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.yarn.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.yarn.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.yarn.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.yarn.policy.rest.ssl.config.file
/etc/hadoop/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.yarn.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/etc/hadoop/ranger-policymgr-ssl.xml mod
create-if-not-exists
ranger.plugin.yarn.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.yarn.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.plugin.yarn.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
diff --git a/storm-agent/conf/ranger-storm-security-changes.cfg
b/storm-agent/conf/ranger-storm-security-changes.cfg
index 9e84c77..1929b7e 100644
--- a/storm-agent/conf/ranger-storm-security-changes.cfg
+++ b/storm-agent/conf/ranger-storm-security-changes.cfg
@@ -21,7 +21,7 @@ ranger.plugin.storm.service.name %REPOSITORY_NAME% mod
create-if-not-exists
ranger.plugin.storm.policy.source.impl
org.apache.ranger.admin.client.RangerAdminRESTClient mod create-if-not-exists
ranger.plugin.storm.policy.rest.url %POLICY_MGR_URL%
mod create-if-not-exists
-ranger.plugin.storm.policy.rest.ssl.config.file
/etc/storm/conf/ranger-policymgr-ssl.xml mod create-if-not-exists
+ranger.plugin.storm.policy.rest.ssl.config.file
%COMPONENT_INSTALL_DIR_NAME%/conf/ranger-policymgr-ssl.xml mod
create-if-not-exists
ranger.plugin.storm.policy.pollIntervalMs 30000
mod create-if-not-exists
ranger.plugin.storm.policy.cache.dir %POLICY_CACHE_FILE_PATH%
mod create-if-not-exists
ranger.plugin.storm.policy.rest.client.connection.timeoutMs 120000
mod create-if-not-exists
