diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index bd46309d1..cc8a730c1 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -16,7 +16,7 @@ import sys import ldap from django.urls import reverse_lazy -from .const import VERSION +from . import const from .conf import load_user_config # Build paths inside the project like this: os.path.join(BASE_DIR, ...) @@ -29,7 +29,7 @@ LOG_DIR = os.path.join(PROJECT_DIR, 'logs') JUMPSERVER_LOG_FILE = os.path.join(LOG_DIR, 'jumpserver.log') ANSIBLE_LOG_FILE = os.path.join(LOG_DIR, 'ansible.log') GUNICORN_LOG_FILE = os.path.join(LOG_DIR, 'gunicorn.log') -VERSION = VERSION +VERSION = const.VERSION if not os.path.isdir(LOG_DIR): os.makedirs(LOG_DIR) @@ -412,7 +412,7 @@ AUTH_LDAP_USER_ATTR_MAP = {"username": "cn", "name": "sn", "email": "mail"} # AUTH_LDAP_GROUP_SEARCH_OU, ldap.SCOPE_SUBTREE, AUTH_LDAP_GROUP_SEARCH_FILTER # ) AUTH_LDAP_CONNECTION_OPTIONS = { - ldap.OPT_TIMEOUT: 5 + ldap.OPT_TIMEOUT: 30 } AUTH_LDAP_GROUP_CACHE_TIMEOUT = 1 AUTH_LDAP_ALWAYS_UPDATE_USER = True