This is an automated email from the ASF dual-hosted git repository. mugdha pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push: new 26a48ea AMBARI-24378 Updating LDAPSettings section for Ranger in Advanced config section. (mugdha) (#1917) 26a48ea is described below commit 26a48eac0cc06c534da51c057d71d895465919e1 Author: Mugdha Varadkar <fimug...@users.noreply.github.com> AuthorDate: Tue Jul 31 11:20:12 2018 +0530 AMBARI-24378 Updating LDAPSettings section for Ranger in Advanced config section. (mugdha) (#1917) --- .../app/data/configs/services/ranger_properties.js | 50 +++------------------- ambari-web/app/models/stack_service.js | 3 +- 2 files changed, 8 insertions(+), 45 deletions(-) diff --git a/ambari-web/app/data/configs/services/ranger_properties.js b/ambari-web/app/data/configs/services/ranger_properties.js index 754e4d4..fa89e70 100644 --- a/ambari-web/app/data/configs/services/ranger_properties.js +++ b/ambari-web/app/data/configs/services/ranger_properties.js @@ -18,48 +18,6 @@ module.exports = [ { - "category": "SolrKerberosSettings", - "filename": "ranger-admin-site.xml", - "name": "xasecure.audit.jaas.Client.option.principal", - "serviceName": "RANGER" - }, - { - "category": "SolrKerberosSettings", - "filename": "ranger-admin-site.xml", - "name": "xasecure.audit.jaas.Client.option.keyTab", - "serviceName": "RANGER" - }, - { - "category": "SolrKerberosSettings", - "filename": "ranger-admin-site.xml", - "name": "xasecure.audit.jaas.Client.loginModuleName", - "serviceName": "RANGER" - }, - { - "category": "SolrKerberosSettings", - "filename": "ranger-admin-site.xml", - "name": "xasecure.audit.jaas.Client.loginModuleControlFlag", - "serviceName": "RANGER" - }, - { - "category": "SolrKerberosSettings", - "filename": "ranger-admin-site.xml", - "name": "xasecure.audit.jaas.Client.option.useKeyTab", - "serviceName": "RANGER" - }, - { - "category": "SolrKerberosSettings", - "filename": "ranger-admin-site.xml", - "name": "xasecure.audit.jaas.Client.option.storeKey", - "serviceName": "RANGER" - }, - { - "category": "SolrKerberosSettings", - "filename": "ranger-admin-site.xml", - "name": "xasecure.audit.jaas.Client.option.serviceName", - "serviceName": "RANGER" - }, - { "category": "RANGER_ADMIN", "filename": "ranger-env.xml", "index": 0, @@ -120,7 +78,9 @@ module.exports = [ "ranger.ldap.bind.dn", "ranger.ldap.bind.password", "ranger.ldap.referral", - "ranger.ldap.user.searchfilter" + "ranger.ldap.user.searchfilter", + "ranger.ldap.group.searchbase", + "ranger.ldap.group.searchfilter" ] }, { @@ -286,12 +246,14 @@ module.exports = [ "category": "ADSettings", "filename": "ranger-admin-site.xml", "name": "ranger.ldap.ad.domain", + "index": 4, "serviceName": "RANGER" }, { "category": "ADSettings", "filename": "ranger-admin-site.xml", "name": "ranger.ldap.ad.url", + "index": 1, "serviceName": "RANGER" }, { @@ -304,12 +266,14 @@ module.exports = [ "category": "ADSettings", "filename": "ranger-admin-site.xml", "name": "ranger.ldap.ad.bind.dn", + "index": 2, "serviceName": "RANGER" }, { "category": "ADSettings", "filename": "ranger-admin-site.xml", "name": "ranger.ldap.ad.bind.password", + "index": 3, "serviceName": "RANGER" }, { diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js index a8d3e3e..618f716 100644 --- a/ambari-web/app/models/stack_service.js +++ b/ambari-web/app/models/stack_service.js @@ -477,8 +477,7 @@ App.StackService.configCategories = function () { App.ServiceConfigCategory.create({ name: 'UnixAuthenticationSettings', displayName: 'Unix Authentication Settings'}), App.ServiceConfigCategory.create({ name: 'ADSettings', displayName: 'AD Settings'}), App.ServiceConfigCategory.create({ name: 'LDAPSettings', displayName: 'LDAP Settings'}), - App.ServiceConfigCategory.create({ name: 'KnoxSSOSettings', displayName: 'Knox SSO Settings'}), - App.ServiceConfigCategory.create({ name: 'SolrKerberosSettings', displayName: 'Solr Kerberos Settings'}) + App.ServiceConfigCategory.create({ name: 'KnoxSSOSettings', displayName: 'Knox SSO Settings'}) ]); break; case 'ACCUMULO':