Merge remote-tracking branch 'github/dev' into dev

e41add61 · ibuler · f4c31d8e · 28e8f204 · e41add61
Commit e41add61 authored Jul 25, 2018 by ibuler
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

settings.py apps/jumpserver/settings.py +1 -0

No files found.
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -336,6 +336,7 @@ AUTH_LDAP_GROUP_SEARCH = LDAPSearch(
 AUTH_LDAP_CONNECTION_OPTIONS = {
    ldap.OPT_TIMEOUT: 5
 }
+AUTH_LDAP_GROUP_CACHE_TIMEOUT = 1
 AUTH_LDAP_ALWAYS_UPDATE_USER = True
 AUTH_LDAP_BACKEND = 'django_auth_ldap.backend.LDAPBackend'