remove ldap mentions (#189)

neutrons · Nov 7, 2024 · 6dae8e1 · 6dae8e1
1 parent 2ba9dba
commit 6dae8e1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git 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 <https://data-workflow.readthedocs.io/en/latest/developer/instruction/build.html?highlight=DJANGO_SETTINGS_MODULE#description-of-settings>`_
 ICAT_PASS              yes    ActiveMQ password
 ICAT_USER                     ActiveMQ username
-LDAP_CERT_FILE         yes    `ldap.OPT_X_TLS_CACERTFILE <https://www.python-ldap.org/en/latest/reference/ldap.html#ldap.OPT_X_TLS_CACERTFILE>`_
 LDAP_DOMAIN_COMPONENT  yes    Use in `AUTH_LDAP_USER_DN_TEMPLATE <https://django-auth-ldap.readthedocs.io/en/latest/reference.html#std:setting-AUTH_LDAP_USER_DN_TEMPLATE>`_
 LDAP_SERVER_URI        yes    `AUTH_LDAP_SERVER_URI <https://django-auth-ldap.readthedocs.io/en/latest/reference.html#auth-ldap-server-uri>`_
 TIME_ZONE                     `Time zone to use <https://docs.djangoproject.com/en/3.2/ref/settings/#time-zone-1>`_

diff --git 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")