Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

pull/4771/head
ibuler 2020-10-13 10:52:18 +08:00
commit 12216a718a
2 changed files with 3 additions and 3 deletions

View File

@ -1,11 +1,11 @@
# SECURITY WARNING: keep the secret key used in production secret!
# 加密秘钥 生产环境中请修改为随机字符串,请勿外泄, 可使用命令生成
# $ cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 49;echo
SECRET_KEY:
SECRET_KEY:
# SECURITY WARNING: keep the bootstrap token used in production secret!
# 预共享Token coco和guacamole用来注册服务账号不在使用原来的注册接受机制
BOOTSTRAP_TOKEN:
BOOTSTRAP_TOKEN:
# Development env open this, when error occur display the full process track, Production disable it
# DEBUG 模式 开启DEBUG后遇到错误时可以看到更多日志

View File

@ -33,7 +33,7 @@ enum-compat==0.0.2
ephem==3.7.6.0
eventlet==0.24.1
future==0.16.0
ForgeryPy3==0.3.2
ForgeryPy3==0.3.1
greenlet==0.4.14
gunicorn==19.9.0
idna==2.6