* [Bugfix] 修复两个配置文件冲突问题

* [Update] Docker中不再提供配置文件
This commit is contained in:
老广
2019-01-08 11:15:09 +08:00
committed by GitHub
parent 0e1d3f93ff
commit 49a166552e
5 changed files with 45 additions and 20 deletions

3
jms
View File

@@ -15,7 +15,8 @@ sys.path.append(BASE_DIR)
from apps import __version__
try:
from config import config as CONFIG
from apps.jumpserver.conf import load_user_config
CONFIG = load_user_config()
except ImportError:
print("Could not find config file, `cp config_example.py config.py`")
sys.exit(1)