diff --git a/.dockerignore b/.dockerignore index 0ddcc29ae..9537605a4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,3 +8,4 @@ celerybeat.pid .vagrant/ apps/xpack/.git .history/ +.idea \ No newline at end of file diff --git a/.isort.cfg b/.isort.cfg index e59d309dc..bdefbe705 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -1,3 +1,4 @@ [settings] line_length=120 known_first_party=common,users,assets,perms,authentication,jumpserver,notification,ops,orgs,rbac,settings,terminal,tickets + diff --git a/config_example.yml b/config_example.yml index 472514cd6..93024c0a5 100644 --- a/config_example.yml +++ b/config_example.yml @@ -75,7 +75,7 @@ REDIS_PORT: 6379 # OTP settings # OTP/MFA 配置 # OTP_VALID_WINDOW: 0 -# OTP_ISSUER_NAME: Jumpserver +# OTP_ISSUER_NAME: JumpServer # 启用定时任务 # PERIOD_TASK_ENABLED: True @@ -87,7 +87,7 @@ REDIS_PORT: 6379 # 浏览器关闭页面后,会话过期 # SESSION_EXPIRE_AT_BROWSER_CLOSE: False -# 每次api请求,session续期 +# 每次 api 请求,session 续期 # SESSION_SAVE_EVERY_REQUEST: True # 仅允许用户从来源处登录 @@ -96,6 +96,4 @@ REDIS_PORT: 6379 # 仅允许已存在的用户登录,不允许第三方认证后,自动创建用户 # ONLY_ALLOW_EXIST_USER_AUTH: False -# 开启 Vault 账号存储 -# VAULT_ENABLED: False diff --git a/entrypoint.sh b/entrypoint.sh index 2e4c5887b..2b0a87307 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -9,4 +9,4 @@ case "$1" in ;; esac -exec "$@" \ No newline at end of file +exec "$@" diff --git a/jms b/jms index 943e19e11..77d002e2c 100755 --- a/jms +++ b/jms @@ -174,7 +174,7 @@ def start_services(): if __name__ == '__main__': parser = argparse.ArgumentParser( description=""" - Jumpserver service control tools; + JumpServer service control tools; Example: \r\n diff --git a/requirements/issues.txt b/requirements/issues.txt index 768d95e1e..4862f9e91 100644 --- a/requirements/issues.txt +++ b/requirements/issues.txt @@ -13,3 +13,5 @@ $ xcode-select --install # libxmlsec 报错 wget 'https://raw.githubusercontent.com/Homebrew/homebrew-core/7f35e6ede954326a10949891af2dba47bbe1fc17/Formula/libxmlsec1.rb' brew install ./libxmlsec1.rb + +# libxmlsec1 \ No newline at end of file diff --git a/run_server.py b/run_server.py deleted file mode 100644 index b7cce251b..000000000 --- a/run_server.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python3 -# coding: utf-8 - -import sys -import subprocess - - -if __name__ == '__main__': - subprocess.call('python3 jms start all', shell=True, stdin=sys.stdin, stdout=sys.stdout) - diff --git a/ui/README.md b/ui/README.md index 57302d82b..2870c05ea 100644 --- a/ui/README.md +++ b/ui/README.md @@ -1,4 +1,4 @@ -| 项目 | 描述 | +| Repo | Description | |--------------------------------------------|----------------------------| | [Lina](https://github.com/jumpserver/lina) | JumpServer Web UI 项目 | | [Luna](https://github.com/jumpserver/luna) | JumpServer Web Terminal 项目 |