From 8307560c8801885a5e10e35997928ca382b88c4b Mon Sep 17 00:00:00 2001 From: comphilip Date: Tue, 27 Oct 2020 15:51:12 +0800 Subject: [PATCH 1/3] Fix "'NoneType' object has no attribute 'lower'" when no AUTH_LDAP_MIRROR_GROUPS defined --- configuration/ldap/ldap_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/ldap/ldap_config.py b/configuration/ldap/ldap_config.py index d1e4444..4cd5b8b 100644 --- a/configuration/ldap/ldap_config.py +++ b/configuration/ldap/ldap_config.py @@ -71,7 +71,7 @@ AUTH_LDAP_USER_FLAGS_BY_GROUP = { # For more granular permissions, we can map LDAP groups to Django groups. AUTH_LDAP_FIND_GROUP_PERMS = environ.get('AUTH_LDAP_FIND_GROUP_PERMS', 'True').lower() == 'true' -AUTH_LDAP_MIRROR_GROUPS = environ.get('AUTH_LDAP_MIRROR_GROUPS', None).lower() == 'true' +AUTH_LDAP_MIRROR_GROUPS = environ.get('AUTH_LDAP_MIRROR_GROUPS', '').lower() == 'true' # Cache groups for one hour to reduce LDAP traffic AUTH_LDAP_CACHE_TIMEOUT = int(environ.get('AUTH_LDAP_CACHE_TIMEOUT', 3600)) From a5aa1bfd3b3fc1047152ef45392f02a19c99b65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ma=CC=88der?= Date: Tue, 27 Oct 2020 09:31:47 +0100 Subject: [PATCH 2/3] Revert changes to 'gunicorn_config.py' --- docker/gunicorn_config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/gunicorn_config.py b/docker/gunicorn_config.py index 9e22310..4ce7763 100644 --- a/docker/gunicorn_config.py +++ b/docker/gunicorn_config.py @@ -6,4 +6,3 @@ errorlog = '-' accesslog = '-' capture_output = False loglevel = 'info' -raw_env = 'prometheus_multiproc_dir=/tmp/metrics' From 074960327b7bc2cc1aca806b16e7ace2458d3e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ma=CC=88der?= Date: Tue, 27 Oct 2020 10:30:55 +0100 Subject: [PATCH 3/3] Preparation for 0.26.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4e8f395..30f6cf8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.26.0 +0.26.1