github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

restore settings

pull/530/head
unknown 2016-09-14 16:10:15 +08:00
parent e7c20f0707
commit c237f82e51
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/jumpserver/settings.py
View File

@ -108,7 +108,6 @@ TEMPLATES = [
# WSGI_APPLICATION = 'jumpserver.wsgi.application' # WSGI_APPLICATION = 'jumpserver.wsgi.application'
LOGIN_REDIRECT_URL = reverse_lazy('index') LOGIN_REDIRECT_URL = reverse_lazy('index')
LOGIN_URL = reverse_lazy('users:login')
# Database # Database
# https://docs.djangoproject.com/en/1.10/ref/settings/#databases # https://docs.djangoproject.com/en/1.10/ref/settings/#databases
@ -228,7 +227,7 @@ USE_L10N = True
USE_TZ = True USE_TZ = True
# I18N translation # I18N translation
LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale'), ] LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale'),]
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.10/howto/static-files/ # https://docs.djangoproject.com/en/1.10/howto/static-files/
@ -281,11 +280,9 @@ WEBSOCKET_URL = '/ws/'
# WebSocket Redis # WebSocket Redis
WS4REDIS_CONNECTION = { WS4REDIS_CONNECTION = {
#'host': CONFIG.REDIS_HOST or '127.0.0.1', 'host': CONFIG.REDIS_HOST or '127.0.0.1',
# 'port': CONFIG.REDIS_PORT or 6379, 'port': CONFIG.REDIS_PORT or 6379,
'host': '192.168.1.190', 'db': 2,
'port': 6379,
'db': 3,
} }
# Set the number of seconds each message shall persisted # Set the number of seconds each message shall persisted
@ -299,23 +296,14 @@ SESSION_ENGINE = 'redis_sessions.session'
SESSION_REDIS_PREFIX = 'session' SESSION_REDIS_PREFIX = 'session'
SESSION_REDIS_HOST = '192.168.1.190'
SESSION_REDIS_PORT = 6379
SESSION_REDIS_DB = 0
SESSION_REDIS_PASSWORD = ''
# Custom User Auth model # Custom User Auth model
AUTH_USER_MODEL = 'users.User' AUTH_USER_MODEL = 'users.User'
# Celery using redis as broker # Celery using redis as broker
# BROKER_URL = 'redis://%(password)s%(host)s:%(port)s/3' % {
BROKER_URL = 'redis://%(password)s%(host)s:%(port)s/3' % { BROKER_URL = 'redis://%(password)s%(host)s:%(port)s/3' % {
'password': CONFIG.REDIS_PASSWORD + ':' if CONFIG.REDIS_PASSWORD else '', 'password': CONFIG.REDIS_PASSWORD + ':' if CONFIG.REDIS_PASSWORD else '',
'host': CONFIG.REDIS_HOST or '127.0.0.1', 'host': CONFIG.REDIS_HOST or '127.0.0.1',
'port': CONFIG.REDIS_PORT or 63790, 'port': CONFIG.REDIS_PORT or 6379,
} }
CELERY_RESULT_BACKEND = BROKER_URL CELERY_RESULT_BACKEND = BROKER_URL