From 860703c2b25a2feafe8276b8c644b0cc6b1572e5 Mon Sep 17 00:00:00 2001 From: Sam Chow Date: Wed, 18 Jul 2018 14:21:25 -0400 Subject: [PATCH] Override config directory in certs install script in config app --- conf/init/certs_install.sh | 2 +- config_app/config_endpoints/api/superuser.py | 2 +- util/config/validators/validate_ldap.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/init/certs_install.sh b/conf/init/certs_install.sh index 4f43c42dc..29be4e8e5 100755 --- a/conf/init/certs_install.sh +++ b/conf/init/certs_install.sh @@ -2,7 +2,7 @@ set -e QUAYPATH=${QUAYPATH:-"."} QUAYCONF=${QUAYCONF:-"$QUAYPATH/conf/stack"} -QUAYCONFIG="$QUAYCONF/stack" +QUAYCONFIG=${QUAYCONFIG:-"$QUAYCONF/stack"} cd ${QUAYDIR:-"/quay-registry"} diff --git a/config_app/config_endpoints/api/superuser.py b/config_app/config_endpoints/api/superuser.py index 7eceac565..d35ccca55 100644 --- a/config_app/config_endpoints/api/superuser.py +++ b/config_app/config_endpoints/api/superuser.py @@ -51,7 +51,7 @@ class SuperUserCustomCertificate(ApiResource): # Call the update script with config dir location to install the certificate immediately. if subprocess.call([os.path.join(INIT_SCRIPTS_LOCATION, 'certs_install.sh')], - env={ 'QUAYCONF': config_provider.get_config_dir_path() }) != 0: + env={ 'QUAYCONFIG': config_provider.get_config_dir_path() }) != 0: raise Exception('Could not install certificates') return '', 204 diff --git a/util/config/validators/validate_ldap.py b/util/config/validators/validate_ldap.py index 7870353d4..622a029f0 100644 --- a/util/config/validators/validate_ldap.py +++ b/util/config/validators/validate_ldap.py @@ -22,7 +22,7 @@ class LDAPValidator(BaseValidator): # 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([os.path.join(init_scripts_location, 'certs_install.sh')], - env={ 'QUAYCONF': config_provider.get_config_dir_path() }) + env={ 'QUAYCONFIG': config_provider.get_config_dir_path() }) # Note: raises ldap.INVALID_CREDENTIALS on failure admin_dn = config.get('LDAP_ADMIN_DN')