Merge pull request #2090 from wojiushixiaobai/docs

[Update]更新

docs/start_automatically.rst

@@ -147,6 +147,7 @@ Systemd 管理启动 Jumpserver
     [Unit]
     Description=jms
     After=network.target mariadb.service redis.service
+    Wants=mariadb.service redis.service
 
     [Service]
     Type=forking
@@ -165,6 +166,7 @@ Systemd 管理启动 Jumpserver
     [Unit]
     Description=coco
     After=network.target jms.service
+    Wants=jms.service
 
     [Service]
     Type=forking
@@ -183,8 +185,9 @@ Systemd 管理启动 Jumpserver
     $ sed -i '143i CATALINA_PID="$CATALINA_BASE/tomcat.pid"' /config/tomcat8/bin/catalina.sh
     $ cat << EOF > /usr/lib/systemd/system/tomcat.service
     [Unit]
-    Description=Apache Tomcat 8
+    Description=guacamole
     After=network.target jms.service
+    Wants=jms.service
 
     [Service]
     Type=forking
@@ -202,14 +205,14 @@ Systemd 管理启动 Jumpserver
     # 开机自启设置
     $ systemctl enable jms
     $ systemctl enable coco
-    $ systemctl enable tomcat
+    $ systemctl enable guacamole
 
     # 启动
     $ systemctl start jms
     $ systemctl start coco
-    $ systemctl start tomcat
+    $ systemctl start guacamole
 
     # 停止
     $ systemctl stop jms
     $ systemctl stop coco
-    $ systemctl stop tomcat
+    $ systemctl stop guacamole

docs/upgrade.rst

@@ -217,6 +217,8 @@
         fi
       done
 
+    $ sh utils/clean_migrations.sh
+
 .. code-block:: shell
 
     $ cd /opt/jumpserver
@@ -263,12 +265,14 @@
 
         # Development env open this, when error occur display the full process track, Production disable it
         # DEBUG 模式 开启DEBUG后遇到错误时可以看到更多日志
-        # DEBUG = False
+        # DEBUG = True
+        DEBUG = False
 
         # DEBUG, INFO, WARNING, ERROR, CRITICAL can set. See https://docs.djangoproject.com/en/1.10/topics/logging/
         # 日志级别
-        # LOG_LEVEL = 'ERROR'
+        # LOG_LEVEL = 'DEBUG'
         # LOG_DIR = os.path.join(BASE_DIR, 'logs')
+        LOG_LEVEL = 'ERROR'
 
         # Database setting, Support sqlite3, mysql, postgres ....
         # 数据库设置
@@ -379,14 +383,15 @@
         # NAME = "localhost"
         NAME = "coco"
 
-        # Bootstrap Token, 预共享秘钥, 用来注册coco使用的service account和terminal
-        # 请和jumpserver 配置文件中保持一致，注册完成后可以删除
-        # BOOTSTRAP_TOKEN = "9JO4#n!Xup2zKZ6V"
-
         # Jumpserver项目的url, api请求注册会使用, 如果Jumpserver没有运行在127.0.0.1:8080,请修改此处
         # CORE_HOST = os.environ.get("CORE_HOST") or 'http://127.0.0.1:8080'
         CORE_HOST = 'http://127.0.0.1:8080'
 
+        # Bootstrap Token, 预共享秘钥, 用来注册coco使用的service account和terminal
+        # 请和jumpserver 配置文件中保持一致，注册完成后可以删除
+        # BOOTSTRAP_TOKEN = "PleaseChangeMe"
+        BOOTSTRAP_TOKEN = "9JO4#n!Xup2zKZ6V"
+
         # 启动时绑定的ip, 默认 0.0.0.0
         # BIND_HOST = '0.0.0.0'
 
@@ -408,7 +413,7 @@
 
         # 设置日志级别 ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL', 'CRITICAL']
         # LOG_LEVEL = 'INFO'
-        LOG_LEVEL = 'WARN'
+        LOG_LEVEL = 'ERROR'
 
         # 日志存放的目录
         # LOG_DIR = os.path.join(BASE_DIR, 'logs')