vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix handling of custom LDAP cert

Browse source 
This change moves the LDAP cert installation into a common script and reorganizes the startup scripts for creating and installing these certs

Fixes #1846
This commit is contained in:
Joseph Schorr 2016-09-19 17:55:08 -04:00
parent 8ab60640fe
commit c7beea2032
5 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
util/config/validator.py
View file

@ -312,7 +312,7 @@ def _validate_ldap(config, password):
# If there is a custom LDAP certificate, then reinstall the certificates for the container.
if config_provider.volume_file_exists(LDAP_CERT_FILENAME):
subprocess.check_call(['/conf/init/install_custom_certs.sh'])
subprocess.check_call(['/conf/init/certs_install.sh'])
# Note: raises ldap.INVALID_CREDENTIALS on failure
admin_dn = config.get('LDAP_ADMIN_DN')