Merge pull request #2502 from wojiushixiaobai/docs

Docs

docs/distributed_05.rst

@@ -61,7 +61,9 @@
     $ cp config_example.yml config.yml
 
     $ SECRET_KEY=`cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 50`  # 生成随机SECRET_KEY
+    $ echo "SECRET_KEY=$SECRET_KEY" >> ~/.bashrc
     $ BOOTSTRAP_TOKEN=`cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 16`  # 生成随机BOOTSTRAP_TOKEN
+    $ echo "BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN" >> ~/.bashrc
 
     $ sed -i "s/SECRET_KEY:/SECRET_KEY: $SECRET_KEY/g" /opt/jumpserver/config.yml
     $ sed -i "s/BOOTSTRAP_TOKEN:/BOOTSTRAP_TOKEN: $BOOTSTRAP_TOKEN/g" /opt/jumpserver/config.yml

docs/start_automatically.rst

@@ -178,7 +178,6 @@ Systemd 管理启动 Jumpserver
 
     # Guacamole
     $ chkconfig guacd on
-    $ sed -i '143i CATALINA_PID="/config/tomcat8/tomcat.pid"' /config/tomcat8/bin/catalina.sh
     $ vi /usr/lib/systemd/system/guacamole.service
     [Unit]
     Description=guacamole
@@ -187,12 +186,12 @@ Systemd 管理启动 Jumpserver
 
     [Service]
     Type=forking
-    PIDFile=/config/tomcat8/tomcat.pid
+    # PIDFile=/config/tomcat8/tomcat.pid
     # BOOTSTRAP_TOKEN 根据实际情况修改
     Environment="JUMPSERVER_SERVER=http://127.0.0.1:8080" "JUMPSERVER_KEY_DIR=/config/guacamole/keys" "GUACAMOLE_HOME=/config/guacamole" "BOOTSTRAP_TOKEN=******"
     ExecStart=/config/tomcat8/bin/startup.sh
-    ExecReload=/bin/kill -s HUP $MAINPID
-    ExecStop=/bin/kill -s QUIT $MAINPID
+    ExecReload=
+    ExecStop=/config/tomcat8/bin/shutdown.sh
 
     [Install]
     WantedBy=multi-user.target

docs/step_by_step.rst

@@ -132,7 +132,7 @@
     $ cp config_example.yml config.yml
 
     $ SECRET_KEY=`cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 50`  # 生成随机SECRET_KEY
-    $ echo "BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN" >> ~/.bashrc
+    $ echo "SECRET_KEY=$SECRET_KEY" >> ~/.bashrc
     $ BOOTSTRAP_TOKEN=`cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 16`  # 生成随机BOOTSTRAP_TOKEN
     $ echo "BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN" >> ~/.bashrc