This is an automated email from the ASF dual-hosted git repository. rob pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 12cb80f6d7f4f4a2b0affca37011409aa9918f26 Author: Dylan Volz <dylan_v...@comcast.com> AuthorDate: Mon Mar 26 10:21:09 2018 -0600 place example ldap.conf properly in app/conf --- traffic_ops/app/conf/development/ldap.conf | 9 --------- traffic_ops/app/conf/{test/ldap.conf => example-ldap.conf} | 0 traffic_ops/app/conf/integration/ldap.conf | 9 --------- traffic_ops/app/conf/production/ldap.conf | 9 --------- 4 files changed, 27 deletions(-) diff --git a/traffic_ops/app/conf/development/ldap.conf b/traffic_ops/app/conf/development/ldap.conf deleted file mode 100644 index 9224ae2..0000000 --- a/traffic_ops/app/conf/development/ldap.conf +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_pass" : "password", - "search_base" : "dc=prefix,dc=domain,dc=suffix", - "admin_dn" : "user@prefix.domain.suffix", - "host" : "ldaps://host:[port]", - "search_query" : "(&(objectCategory=person)(objectClass=user)(userName=%s))", - "verify_tls" : "true", - "ldap_timeout_secs" : 20 -} diff --git a/traffic_ops/app/conf/test/ldap.conf b/traffic_ops/app/conf/example-ldap.conf similarity index 100% rename from traffic_ops/app/conf/test/ldap.conf rename to traffic_ops/app/conf/example-ldap.conf diff --git a/traffic_ops/app/conf/integration/ldap.conf b/traffic_ops/app/conf/integration/ldap.conf deleted file mode 100644 index 9224ae2..0000000 --- a/traffic_ops/app/conf/integration/ldap.conf +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_pass" : "password", - "search_base" : "dc=prefix,dc=domain,dc=suffix", - "admin_dn" : "user@prefix.domain.suffix", - "host" : "ldaps://host:[port]", - "search_query" : "(&(objectCategory=person)(objectClass=user)(userName=%s))", - "verify_tls" : "true", - "ldap_timeout_secs" : 20 -} diff --git a/traffic_ops/app/conf/production/ldap.conf b/traffic_ops/app/conf/production/ldap.conf deleted file mode 100644 index 9224ae2..0000000 --- a/traffic_ops/app/conf/production/ldap.conf +++ /dev/null @@ -1,9 +0,0 @@ -{ - "admin_pass" : "password", - "search_base" : "dc=prefix,dc=domain,dc=suffix", - "admin_dn" : "user@prefix.domain.suffix", - "host" : "ldaps://host:[port]", - "search_query" : "(&(objectCategory=person)(objectClass=user)(userName=%s))", - "verify_tls" : "true", - "ldap_timeout_secs" : 20 -} -- To stop receiving notification emails like this one, please contact r...@apache.org.