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 e01712b1175a402be97525a1dd788b5b4a655335 Author: Dylan Volz <dylan_v...@comcast.com> AuthorDate: Mon Mar 26 09:42:45 2018 -0600 add new fields to ldap.conf generation in postinstall --- traffic_ops/install/bin/_postinstall | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/traffic_ops/install/bin/_postinstall b/traffic_ops/install/bin/_postinstall index f059b2a..37a819d 100755 --- a/traffic_ops/install/bin/_postinstall +++ b/traffic_ops/install/bin/_postinstall @@ -269,6 +269,8 @@ sub generateLdapConf { } } + delete $ldapConf{setupLdap} + # do a very loose check of form -- 'host' must be hostname:port if ( $ldapConf{ host } !~ /^\S+:\d+$/ ) { errorOut("host in $fileName must be of form 'hostname:port'"); @@ -469,6 +471,10 @@ sub getDefaults { "Traffic Ops url?" => "http://localhost:3000", "config_var" => "base_url" }, + { + "ldap.conf location? (default is /opt/traffic_ops/app/conf/ldap.conf)" => "", + "config_var" => "ldap_conf_location" + } ], $ldapConfFile => [ { @@ -491,6 +497,18 @@ sub getDefaults { { "LDAP Search Base" => "", "config_var" => "search_base" + }, + { + "LDAP Search Query" => "", + "config_var" => "search_query" + }, + { + "LDAP Skip TLS verify" => "", + "config_var" => "insecure" + }, + { + "LDAP Timeout Seconds" => "", + "config_var" => "ldap_timeout_secs" } ], $usersConfFile => [ -- To stop receiving notification emails like this one, please contact r...@apache.org.