[Fix]改错

docs/distributed_05.rst

@@ -64,7 +64,7 @@
     $ BOOTSTRAP_TOKEN=`cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 16  # 生成随机BOOTSTRAP_TOKEN
 
     $ sed -i "s/SECRET_KEY:/SECRET_KEY: $SECRET_KEY/g" /opt/jumpserver/config.yml
-    $ sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOSECRET_KEY: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml
+    $ sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOKEN: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml
     $ sed -i "s/# DEBUG: true/DEBUG: false/g" /opt/jumpserver/config.yml
     $ sed -i "s/# LOG_LEVEL: DEBUG/LOG_LEVEL: ERROR/g" /opt/jumpserver/config.yml
     $ sed -i "s/# SESSION_EXPIRE_AT_BROWSER_CLOSE: False/SESSION_EXPIRE_AT_BROWSER_CLOSE: True/g" /opt/jumpserver/config.yml

docs/faq.rst

@@ -83,7 +83,7 @@ FAQ
 
 .. code-block:: shell
 
-    $ vi /opt/coco/conf.yml
+    $ vi /opt/coco/config.yml
 
     # 把 SSH_TIMEOUT = 15 修改成你想要的数字 单位为：秒
     SSH_TIMEOUT = 60

docs/faq_install.rst

@@ -127,7 +127,7 @@
 
     这是因为当前系统的 hostname 有 coco 不支持的字符,需要手动指定 coco 的 NAME
     $ cd /opt/coco/
-    $ vi conf.yml
+    $ vi config.yml
 
     # 项目名称, 会用来向Jumpserver注册, 识别而已, 不能重复
     # NAME = "localhost"
@@ -149,8 +149,8 @@
 
 .. code-block:: vim
 
-    # 这是因为 coco 无法连接到 jumpserver 报的错误,确定 http://xxxx:8080 设置正确(配置文件 coco/conf.yml)
-    # 如果 jumpserver 的IP和端口不对,请手动修改 conf.yml 的 CORE_HOST
+    # 这是因为 coco 无法连接到 jumpserver 报的错误,确定 http://xxxx:8080 设置正确(配置文件 coco/config.yml)
+    # 如果 jumpserver 的IP和端口不对,请手动修改 config.yml 的 CORE_HOST
 
 18. 运行 ./cocod start 后提示 Unexpected error occur: 'AppService' object has no attribute 'get_system_user_cmd_filter_rules'
 

docs/faq_ssh.rst

@@ -81,7 +81,7 @@ SSH 协议资产连接错误排查思路
 
     # 这是因为当前系统的 hostname 有 coco 不支持的字符,需要手动指定 coco 的 NAME
     $ cd /opt/coco/
-    $ vi conf.yml
+    $ vi config.yml
 
     # 项目名称, 会用来向Jumpserver注册, 识别而已, 不能重复
     # NAME = "localhost"

docs/migration.rst

@@ -53,7 +53,7 @@
 .. code-block:: shell
 
     $ cd /opt/jumpserver
-    $ vi conf.yml
+    $ vi config.yml
     # 把数据库和 redis 信息修改并保存
 
 4. 启动 jumpserver

docs/quickinstall.rst

@@ -12,7 +12,7 @@
 端口说明
 ~~~~~~~~~~~~~~
 - Jumpserver 默认端口为 8080/tcp 配置文件在 jumpserver/config.yml
-- Coco 默认 SSH 端口为 2222/tcp ,默认 Web Terminal 端口为 5000/tcp 配置文件在 coco/conf.yml
+- Coco 默认 SSH 端口为 2222/tcp ,默认 Web Terminal 端口为 5000/tcp 配置文件在 coco/config.yml
 - Guacamole 默认端口为 8081/tcp 在 docker run 时指定
 - Nginx 默认端口为 80/tcp
 - Redis 默认端口为 6379/tcp

docs/setup_by_centos7.rst

@@ -107,7 +107,7 @@ CentOS 7 安装文档
     $ BOOTSTRAP_TOKEN=`cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 16  # 生成随机BOOTSTRAP_TOKEN
 
     $ sed -i "s/SECRET_KEY:/SECRET_KEY: $SECRET_KEY/g" /opt/jumpserver/config.yml
-    $ sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOSECRET_KEY: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml
+    $ sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOKEN: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml
     $ sed -i "s/# DEBUG: true/DEBUG: false/g" /opt/jumpserver/config.yml
     $ sed -i "s/# LOG_LEVEL: DEBUG/LOG_LEVEL: ERROR/g" /opt/jumpserver/config.yml
     $ sed -i "s/# SESSION_EXPIRE_AT_BROWSER_CLOSE: False/SESSION_EXPIRE_AT_BROWSER_CLOSE: True/g" /opt/jumpserver/config.yml

docs/setup_by_fast.rst

@@ -135,7 +135,7 @@
       && Server_IP=`ip addr | grep inet | egrep -v '(127.0.0.1|inet6|docker)' | awk '{print $2}' | tr -d "addr:" | head -n 1 | cut -d / -f1` \
       && mysql -uroot -e "create database jumpserver default charset 'utf8';grant all on jumpserver.* to 'jumpserver'@'127.0.0.1' identified by '$DB_PASSWORD';flush privileges;" \
       && sed -i "s/SECRET_KEY:/SECRET_KEY: $SECRET_KEY/g" /opt/jumpserver/config.yml \
-      && sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOSECRET_KEY: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml \
+      && sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOKEN: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml \
       && sed -i "s/# DEBUG: true/DEBUG: false/g" /opt/jumpserver/config.yml \
       && sed -i "s/# LOG_LEVEL: DEBUG/LOG_LEVEL: ERROR/g" /opt/jumpserver/config.yml \
       && sed -i "s/# SESSION_EXPIRE_AT_BROWSER_CLOSE: False/SESSION_EXPIRE_AT_BROWSER_CLOSE: True/g" /opt/jumpserver/config.yml \

docs/setup_by_optimization.rst

@@ -21,7 +21,7 @@
 .. code-block:: shell
 
     $ cd /opt/coco
-    $ vi conf.yml
+    $ vi config.yml
 
     # 调整 log_level
     ...

docs/setup_by_ubuntu.rst

@@ -128,7 +128,7 @@
     $ BOOTSTRAP_TOKEN=`cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 16  # 生成随机BOOTSTRAP_TOKEN
 
     $ sed -i "s/SECRET_KEY:/SECRET_KEY: $SECRET_KEY/g" /opt/jumpserver/config.yml
-    $ sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOSECRET_KEY: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml
+    $ sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOKEN: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml
     $ sed -i "s/# DEBUG: true/DEBUG: false/g" /opt/jumpserver/config.yml
     $ sed -i "s/# LOG_LEVEL: DEBUG/LOG_LEVEL: ERROR/g" /opt/jumpserver/config.yml
     $ sed -i "s/# SESSION_EXPIRE_AT_BROWSER_CLOSE: False/SESSION_EXPIRE_AT_BROWSER_CLOSE: True/g" /opt/jumpserver/config.yml
@@ -250,8 +250,8 @@
 
     $ cd /opt/coco
     $ mkdir keys logs
-    $ cp conf_example.yml conf.yml
-    $ vim conf.yml
+    $ cp config_example.yml config.yml
+    $ vim config.yml
 
 .. code-block:: yaml
 

docs/setup_by_ubuntu18.rst

@@ -112,7 +112,7 @@ Ubuntu 18.04 安装文档
     $ BOOTSTRAP_TOKEN=`cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 16  # 生成随机BOOTSTRAP_TOKEN
 
     $ sed -i "s/SECRET_KEY:/SECRET_KEY: $SECRET_KEY/g" /opt/jumpserver/config.yml
-    $ sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOSECRET_KEY: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml
+    $ sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOKEN: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml
     $ sed -i "s/# DEBUG: true/DEBUG: false/g" /opt/jumpserver/config.yml
     $ sed -i "s/# LOG_LEVEL: DEBUG/LOG_LEVEL: ERROR/g" /opt/jumpserver/config.yml
     $ sed -i "s/# SESSION_EXPIRE_AT_BROWSER_CLOSE: False/SESSION_EXPIRE_AT_BROWSER_CLOSE: True/g" /opt/jumpserver/config.yml

docs/step_by_step.rst

@@ -142,7 +142,7 @@
     $ BOOTSTRAP_TOKEN=`cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 16  # 生成随机BOOTSTRAP_TOKEN
 
     $ sed -i "s/SECRET_KEY:/SECRET_KEY: $SECRET_KEY/g" /opt/jumpserver/config.yml
-    $ sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOSECRET_KEY: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml
+    $ sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOKEN: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml
     $ sed -i "s/# DEBUG: true/DEBUG: false/g" /opt/jumpserver/config.yml
     $ sed -i "s/# LOG_LEVEL: DEBUG/LOG_LEVEL: ERROR/g" /opt/jumpserver/config.yml
     $ sed -i "s/# SESSION_EXPIRE_AT_BROWSER_CLOSE: False/SESSION_EXPIRE_AT_BROWSER_CLOSE: True/g" /opt/jumpserver/config.yml
@@ -263,12 +263,12 @@
 
     $ cd /opt/coco
     $ mkdir keys logs
-    $ cp conf_example.yml conf.yml
+    $ cp config_example.yml config.yml
 
-    $ sed -i "s/BOOTSTRAP_TOKEN: <ChangeIT>/BOOTSTRAP_TOSECRET_KEY: $BOOTSTRAP_TOKEN/g" /opt/coco/conf.yml
-    $ sed -i "s/# LOG_LEVEL: INFO/LOG_LEVEL: ERROR/g" /opt/coco/conf.yml
+    $ sed -i "s/BOOTSTRAP_TOKEN: <ChangeIT>/BOOTSTRAP_TOKEN: $BOOTSTRAP_TOKEN/g" /opt/coco/config.yml
+    $ sed -i "s/# LOG_LEVEL: INFO/LOG_LEVEL: ERROR/g" /opt/coco/config.yml
 
-    $ vi conf.yml
+    $ vi config.yml
 
 .. code-block:: yaml
 

docs/upgrade.rst

@@ -384,9 +384,9 @@
     $ ./cocod stop
     $ mv conf.py conf.bak
 
-    # 更新 conf.yml ,请根据你原备份的 conf.yml 内容进行修改
-    $ cp conf_example.yml conf.yml
-    $ vi conf.yml
+    # 更新 config.yml ,请根据你原备份的 conf.bak 内容进行修改
+    $ cp config_example.yml config.yml
+    $ vi config.yml
 
 .. code-block:: vim
 
@@ -614,9 +614,9 @@
     $ ./cocod stop
     $ mv conf.py conf.bak
 
-    # 更新 conf.yml ,请根据你原备份的 conf.bak 内容进行修改
-    $ cp conf_example.yml conf.yml
-    $ vi conf.yml
+    # 更新 config.yml ,请根据你原备份的 conf.bak 内容进行修改
+    $ cp config_example.yml config.yml
+    $ vi config.yml
 
 .. code-block:: vim
 
@@ -844,9 +844,9 @@
     $ ./cocod stop
     $ mv conf.py conf.bak
 
-    # 更新 conf.yml ,请根据你原备份的 conf.yml 内容进行修改
-    $ cp conf_example.yml conf.yml
-    $ vi conf.yml
+    # 更新 config.yml ,请根据你原备份的 config.yml 内容进行修改
+    $ cp config_example.yml config.yml
+    $ vi config.yml
 
 .. code-block:: vim