Switch to install custom LDAP cert by name

This commit is contained in:
Joseph Schorr 2016-06-09 14:47:08 -04:00
parent f36442aa0d
commit 66ec1d81ce
4 changed files with 24 additions and 32 deletions

View file

@ -46,13 +46,8 @@ def get_users_handler(config, config_provider, override_config_dir):
email_attr = config.get('LDAP_EMAIL_ATTR', 'mail')
allow_tls_fallback = config.get('LDAP_ALLOW_INSECURE_FALLBACK', False)
tls_cert_path = None
if config_provider.volume_file_exists(LDAP_CERT_FILENAME):
with config_provider.get_volume_file(LDAP_CERT_FILENAME) as f:
tls_cert_path = f.name
return LDAPUsers(ldap_uri, base_dn, admin_dn, admin_passwd, user_rdn, uid_attr, email_attr,
tls_cert_path, allow_tls_fallback)
allow_tls_fallback)
if authentication_type == 'JWT':
verify_url = config.get('JWT_VERIFY_ENDPOINT')