From 2bbd05d8588bca339a444dabb573e20e82bca5f1 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Mon, 27 Jan 2020 17:08:43 +0100
Subject: [PATCH] TMSS-139: minor tweaks
---
SAS/TMSS/src/tmss/settings.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/SAS/TMSS/src/tmss/settings.py b/SAS/TMSS/src/tmss/settings.py
index e7d34491adb..162bb6538de 100644
--- a/SAS/TMSS/src/tmss/settings.py
+++ b/SAS/TMSS/src/tmss/settings.py
@@ -13,13 +13,17 @@ https://docs.djangoproject.com/en/2.0/ref/settings/
import os
import ldap
import logging
-from lofar.common import dbcredentials
+from lofar.common import dbcredentials, isDevelopmentEnvironment
# logger
-logger = logging.getLogger('django_auth_ldap')
-logger.addHandler(logging.StreamHandler())
-logger.setLevel(logging.INFO)
+logger = logging.getLogger(__name__)
+# fix/setup django_auth_ldap logging
+logging.getLogger('django_auth_ldap').addHandler(logging.StreamHandler())
+logging.getLogger('django_auth_ldap').setLevel(logging.INFO)
+
+# from pprint import pprint
+# pprint(dict(os.environ))
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -159,7 +163,7 @@ AUTH_LDAP_CONNECTION_OPTIONS = { ldap.OPT_X_TLS_REQUIRE_CERT : ldap.OPT_X_TLS_NE
# AUTH_LDAP_BIND_DN = '' # our LDAP is open
# AUTH_LDAP_BIND_PASSWORD = '' # our LDAP is open
protocol = 'ldaps://'
-if 'test' in ldap_creds_name:
+if isDevelopmentEnvironment():
logging.warning('Test ldap credentials detected, using insecure connection for ldap autenthication') # mock LDAP does not support ldaps://
protocol = 'ldap://'
AUTH_LDAP_SERVER_URI = "%s%s:%s" % (protocol, django_ldap_credentials.host, django_ldap_credentials.port)
--
GitLab