diff --git a/docs/developer/instruction/deployment.rst b/docs/developer/instruction/deployment.rst index 4070ad5a..0d491311 100644 --- a/docs/developer/instruction/deployment.rst +++ b/docs/developer/instruction/deployment.rst @@ -28,7 +28,6 @@ DATABASE_USER PostgreSQL Owner username DJANGO_SETTINGS_MODULE `Description of settings `_ ICAT_PASS yes ActiveMQ password ICAT_USER ActiveMQ username -LDAP_CERT_FILE yes `ldap.OPT_X_TLS_CACERTFILE `_ LDAP_DOMAIN_COMPONENT yes Use in `AUTH_LDAP_USER_DN_TEMPLATE `_ LDAP_SERVER_URI yes `AUTH_LDAP_SERVER_URI `_ TIME_ZONE `Time zone to use `_ diff --git a/src/webmon_app/reporting/reporting_app/settings/base.py b/src/webmon_app/reporting/reporting_app/settings/base.py index 0bad2296..c17c1e4a 100644 --- a/src/webmon_app/reporting/reporting_app/settings/base.py +++ b/src/webmon_app/reporting/reporting_app/settings/base.py @@ -148,11 +148,6 @@ def validate_ldap_settings(server_uri, user_dn_template): "email": "mail", } -# manually specified cert file -AUTH_LDAP_CERT_FILE = environ.get("LDAP_CERT_FILE", "") -if AUTH_LDAP_CERT_FILE: - AUTH_LDAP_GLOBAL_OPTIONS = {ldap.OPT_X_TLS_CACERTFILE: AUTH_LDAP_CERT_FILE} - # ONCat Catalog CATALOG_URL = environ.get("CATALOG_URL") CATALOG_ID = environ.get("CATALOG_ID")