Skip to content

Commit 6dae8e1

Browse files
authored
remove ldap mentions (#189)
1 parent 2ba9dba commit 6dae8e1

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

docs/developer/instruction/deployment.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ DATABASE_USER PostgreSQL Owner username
2828
DJANGO_SETTINGS_MODULE `Description of settings <https://data-workflow.readthedocs.io/en/latest/developer/instruction/build.html?highlight=DJANGO_SETTINGS_MODULE#description-of-settings>`_
2929
ICAT_PASS yes ActiveMQ password
3030
ICAT_USER ActiveMQ username
31-
LDAP_CERT_FILE yes `ldap.OPT_X_TLS_CACERTFILE <https://www.python-ldap.org/en/latest/reference/ldap.html#ldap.OPT_X_TLS_CACERTFILE>`_
3231
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>`_
3332
LDAP_SERVER_URI yes `AUTH_LDAP_SERVER_URI <https://django-auth-ldap.readthedocs.io/en/latest/reference.html#auth-ldap-server-uri>`_
3433
TIME_ZONE `Time zone to use <https://docs.djangoproject.com/en/3.2/ref/settings/#time-zone-1>`_

src/webmon_app/reporting/reporting_app/settings/base.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,6 @@ def validate_ldap_settings(server_uri, user_dn_template):
148148
"email": "mail",
149149
}
150150

151-
# manually specified cert file
152-
AUTH_LDAP_CERT_FILE = environ.get("LDAP_CERT_FILE", "")
153-
if AUTH_LDAP_CERT_FILE:
154-
AUTH_LDAP_GLOBAL_OPTIONS = {ldap.OPT_X_TLS_CACERTFILE: AUTH_LDAP_CERT_FILE}
155-
156151
# ONCat Catalog
157152
CATALOG_URL = environ.get("CATALOG_URL")
158153
CATALOG_ID = environ.get("CATALOG_ID")

0 commit comments

Comments
 (0)