[GitHub] rob05c closed pull request #2319: Fix ldap conf load

[GitBox <gi...@apache.org>]

rob05c closed pull request #2319: Fix ldap conf load
URL: https://github.com/apache/incubator-trafficcontrol/pull/2319
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/traffic_ops/app/conf/example-ldap.conf b/traffic_ops/app/conf/example-ldap.conf
index 9224ae2c8..34ce4b624 100644
--- a/traffic_ops/app/conf/example-ldap.conf
+++ b/traffic_ops/app/conf/example-ldap.conf
@@ -4,6 +4,6 @@
    "admin_dn" : "user@prefix.domain.suffix",
    "host" : "ldaps://host:[port]",
    "search_query" : "(&(objectCategory=person)(objectClass=user)(userName=%s))",
-   "verify_tls" : "true",
+   "insecure" : "false",
    "ldap_timeout_secs" : 20
 }
diff --git a/traffic_ops/traffic_ops_golang/config/config.go b/traffic_ops/traffic_ops_golang/config/config.go
index 17248cf38..25f2188b5 100644
--- a/traffic_ops/traffic_ops_golang/config/config.go
+++ b/traffic_ops/traffic_ops_golang/config/config.go
@@ -171,7 +171,7 @@ func LoadConfig(cdnConfPath string, dbConfPath string, riakConfPath string, appV
 		}
 	} else { // ldap config location not specified in cdn.conf, check in directory with cdn.conf for backwards compatibility with perl.
 		confDir := filepath.Dir(cdnConfPath)
-		genericLDAPConfPath := filepath.Join(confDir, "cdn.conf")
+		genericLDAPConfPath := filepath.Join(confDir, "ldap.conf")
 		if _, err := os.Stat(genericLDAPConfPath); !os.IsNotExist(err) { // ldap.conf exists and we should error if it is not readable/parseable.
 			cfg.LDAPEnabled, cfg.ConfigLDAP, err = GetLDAPConfig(genericLDAPConfPath)
 			if err != nil { // no config or unparseable, do not enable LDAP


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services