Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CFC65200D1E for ; Tue, 12 Sep 2017 12:11:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CEE5C1609C8; Tue, 12 Sep 2017 10:11:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3237F1609CC for ; Tue, 12 Sep 2017 12:11:06 +0200 (CEST) Received: (qmail 2999 invoked by uid 500); 12 Sep 2017 10:11:05 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 2647 invoked by uid 99); 12 Sep 2017 10:11:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Sep 2017 10:11:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C6147F57DE; Tue, 12 Sep 2017 10:11:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lpuskas@apache.org To: commits@ambari.apache.org Date: Tue, 12 Sep 2017 10:11:16 -0000 Message-Id: <9cf8e971556c45249829fa702e9a7550@git.apache.org> In-Reply-To: <5a90cf5836c64eebbd1d326bc918c4f7@git.apache.org> References: <5a90cf5836c64eebbd1d326bc918c4f7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/16] ambari git commit: AMBARI-21307 Add all known LDAP properties to AmbariConfigurationEnum (benyoka) archived-at: Tue, 12 Sep 2017 10:11:07 -0000 AMBARI-21307 Add all known LDAP properties to AmbariConfigurationEnum (benyoka) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/225bb495 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/225bb495 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/225bb495 Branch: refs/heads/feature-branch-AMBARI-21307 Commit: 225bb495c98e702ec829dca2d00fd5bc58c700a3 Parents: b59af14 Author: Balazs Bence Sari Authored: Mon Sep 4 12:45:07 2017 +0200 Committer: lpuskas Committed: Tue Sep 12 12:07:35 2017 +0200 ---------------------------------------------------------------------- .../ambari/server/ldap/AmbariLdapConfiguration.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/225bb495/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java index b1cbced..e913e77 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java @@ -40,22 +40,35 @@ public class AmbariLdapConfiguration { USE_SSL("ambari.ldap.usessl"), LDAP_SERVER_HOST("ambari.ldap.server.host"), LDAP_SERVER_PORT("ambari.ldap.server.port"), + LDAP_TRUSTSTORE("ambari.ldap.truststore"), LDAP_TRUSTSTORE_TYPE("ambari.ldap.truststore.type"), LDAP_TRUSTSTORE_PATH("ambari.ldap.truststore.path"), + LDAP_TRUSTSTORE_PASSWORD("ambari.ldap.truststore.password"), BASE_DN("ambari.ldap.bind.dn"), + REFERRAL("ambari.ldap.referral"), + PAGINATION_ENABLED("ambari.ldap.pagination.enabled"), BIND_ANONIMOUSLY("ambari.ldap.bindanonymously"), MANAGER_DN("ambari.ldap.managerdn"), MANAGER_PASSWORD("ambari.ldap.managerpassword"), USER_OBJECT_CLASS("ambari.ldap.user.object.class"), USER_NAME_ATTRIBUTE("ambari.ldap.user.name.attribute"), + USER_NAME_FORCE_LOWERCASE("ambari.ldap.username.force.lowercase"), USER_SEARCH_BASE("ambari.ldap.user.search.base"), + SYNC_USER_MEMBER_REPLACE_PATTERN("ambari.ldap.sync.user.member.replacepattern"), + SYNC_USER_MEMBER_FILTER("ambari.ldap.sync.user.member_filter"), + ADMIN_GROUP_MAPPING_RULES ("ambari.ldap.admin.group.mappingrules"), GROUP_OBJECT_CLASS("ambari.ldap.group.object.class"), GROUP_NAME_ATTRIBUTE("ambari.ldap.group.name.attribute"), GROUP_MEMBER_ATTRIBUTE("ambari.ldap.group.member.attribute"), GROUP_SEARCH_BASE("ambari.ldap.group.search.base"), - DN_ATTRIBUTE("authentication.ldap.dnAttribute"); + SYNC_GROUP_MEMBER_REPLACE_PATTERN("ambari.ldap.sync.group.member.replacepattern"), + SYNC_GROUP_MEMBER_FILTER("ambari.ldap.sync.group.member_filter"), + DN_ATTRIBUTE("authentication.ldap.dnAttribute"), + + TEST_USER_NAME("ambari.ldap.test.user.name"), + TEST_USER_PASSWORD("ambari.ldap.test.user.password"); private String propertyName;