[ambari] branch trunk updated: AMBARI-24662. Log Search: Ldap default fixes.

[oleewere]

This is an automated email from the ASF dual-hosted git repository.

oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new a06742b  AMBARI-24662. Log Search: Ldap default fixes.
a06742b is described below

commit a06742b217874289de907f845266c4d63d7f2f81
Author: Oliver Szabo <oleew...@gmail.com>
AuthorDate: Fri Sep 21 00:20:57 2018 +0200

    AMBARI-24662. Log Search: Ldap default fixes.
---
 .../apache/ambari/logsearch/conf/LogSearchLdapAuthConfig.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchLdapAuthConfig.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchLdapAuthConfig.java
index 6e633b4..5218062 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchLdapAuthConfig.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchLdapAuthConfig.java
@@ -28,7 +28,7 @@ import static 
org.apache.ambari.logsearch.common.LogSearchConstants.LOGSEARCH_PR
 
 @Configuration
 public class LogSearchLdapAuthConfig {
-  @Value("${logsearch.auth.ldap.url:ldap://localhost:389}";)
+  @Value("${logsearch.auth.ldap.url:}")
   @LogSearchPropertyDescription(
     name = "logsearch.auth.ldap.url",
     description = "URL of LDAP database.",
@@ -38,7 +38,7 @@ public class LogSearchLdapAuthConfig {
   )
   private String ldapUrl;
 
-  @Value("${logsearch.auth.ldap.manager.dn:cn=admin,dc=planetexpress,dc=com}")
+  @Value("${logsearch.auth.ldap.manager.dn:}")
   @LogSearchPropertyDescription(
     name = "logsearch.auth.ldap.manager.dn",
     description = "DN of the LDAP manger user (it is a must if LDAP groups are 
used).",
@@ -98,7 +98,7 @@ public class LogSearchLdapAuthConfig {
   )
   private String ldapUserSearchFilter;
 
-  @Value("${logsearch.auth.ldap.group.search.base:ou=people}")
+  @Value("${logsearch.auth.ldap.group.search.base:}")
   @LogSearchPropertyDescription(
     name = "logsearch.auth.ldap.group.search.base",
     description = "Group search base - defines where to find LDAP groups. 
Won't do any authority/role mapping if this field is empty.",
@@ -108,7 +108,7 @@ public class LogSearchLdapAuthConfig {
   )
   private String ldapGroupSearchBase;
 
-  @Value("${logsearch.auth.ldap.group.search.filter:(member={0})}")
+  @Value("${logsearch.auth.ldap.group.search.filter:}")
   @LogSearchPropertyDescription(
     name = "logsearch.auth.ldap.group.search.filter",
     description = "Group search filter which is used to get membership data 
for a specific user",
@@ -118,7 +118,7 @@ public class LogSearchLdapAuthConfig {
   )
   private String ldapGroupSearchFilter;
 
-  @Value("${logsearch.auth.ldap.group.role.attribute:cn}")
+  @Value("${logsearch.auth.ldap.group.role.attribute:}")
   @LogSearchPropertyDescription(
     name = "logsearch.auth.ldap.group.role.attribute",
     description = "Attribute for identifying LDAP groups (group name)",