Mascali
/
netbox-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #353 from netbox-community/develop 

Version 0.26.1
This commit is contained in:
Christian Mäder 2020-10-27 12:32:43 +01:00 committed by GitHub
parent 43aea3a1dd 074960327b
commit 097bea8702
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.26.0 0.26.1

2
configuration/ldap/ldap_config.py
View File

@ -71,7 +71,7 @@ AUTH_LDAP_USER_FLAGS_BY_GROUP = {
# For more granular permissions, we can map LDAP groups to Django groups. # 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_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 # Cache groups for one hour to reduce LDAP traffic
AUTH_LDAP_CACHE_TIMEOUT = int(environ.get('AUTH_LDAP_CACHE_TIMEOUT', 3600)) AUTH_LDAP_CACHE_TIMEOUT = int(environ.get('AUTH_LDAP_CACHE_TIMEOUT', 3600))

1
docker/gunicorn_config.py
View File

@ -6,4 +6,3 @@ errorlog = '-'
accesslog = '-' accesslog = '-'
capture_output = False capture_output = False
loglevel = 'info' loglevel = 'info'
raw_env = 'prometheus_multiproc_dir=/tmp/metrics'