Merge pull request #353 from netbox-community/develop

Version 0.26.1
netbox-community · Oct 27, 2020 · 097bea8 · 097bea8
2 parents 43aea3a + 0749603
commit 097bea8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.26.0
+0.26.1
diff --git a/configuration/ldap/ldap_config.py b/configuration/ldap/ldap_config.py
@@ -71,7 +71,7 @@ def _import_group_type(group_type_name):
 
 # 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))

diff --git a/docker/gunicorn_config.py b/docker/gunicorn_config.py
@@ -6,4 +6,3 @@
 accesslog = '-'
 capture_output = False
 loglevel = 'info'
-raw_env = 'prometheus_multiproc_dir=/tmp/metrics'