Merge pull request #2614 from wojiushixiaobai/docs

[Update]更新文档

docs/setup_by_centos.rst

@@ -358,8 +358,6 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
 
 .. code-block:: shell
 
-    $ mkdir /usr/local/lib/freerdp/
-    $ ln -s /usr/local/lib/freerdp /usr/lib64/freerdp
     $ rpm --import http://li.nux.ro/download/nux/RPM-GPG-KEY-nux.ro
     $ rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm
     $ yum -y localinstall --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm
@@ -367,6 +365,10 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
     $ yum install -y java-1.8.0-openjdk libtool
     $ yum install -y cairo-devel libjpeg-turbo-devel libpng-devel uuid-devel
     $ yum install -y ffmpeg-devel freerdp-devel freerdp-plugins pango-devel libssh2-devel libtelnet-devel libvncserver-devel pulseaudio-libs-devel openssl-devel libvorbis-devel libwebp-devel ghostscript
+    $ ln -s /usr/local/lib/freerdp/guacai.so /usr/lib64/freerdp/guacai.so
+    $ ln -s /usr/local/lib/freerdp/guacdr.so /usr/lib64/freerdp/guacdr.so
+    $ ln -s /usr/local/lib/freerdp/guacsnd.so /usr/lib64/freerdp/guacsnd.so
+    $ ln -s /usr/local/lib/freerdp/guacsvc.so /usr/lib64/freerdp/guacsvc.so
 
 **5.2 编译安装 guacamole 服务**
 
@@ -393,10 +395,10 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
     $ ln -sf /opt/docker-guacamole/root/app/guacamole/guacamole.properties /config/guacamole/guacamole.properties  # guacamole 配置文件
 
     $ cd /config
-    $ wget http://mirror.bit.edu.cn/apache/tomcat/tomcat-8/v8.5.39/bin/apache-tomcat-8.5.39.tar.gz
-    $ tar xf apache-tomcat-8.5.39.tar.gz
-    $ rm -rf apache-tomcat-8.5.39.tar.gz
-    $ mv apache-tomcat-8.5.39 tomcat8
+    $ wget http://mirrors.tuna.tsinghua.edu.cn/apache/tomcat/tomcat-8/v8.5.40/bin/apache-tomcat-8.5.40.tar.gz
+    $ tar xf apache-tomcat-8.5.40.tar.gz
+    $ rm -rf apache-tomcat-8.5.40.tar.gz
+    $ mv apache-tomcat-8.5.40 tomcat8
     $ rm -rf /config/tomcat8/webapps/*
     $ ln -sf /opt/docker-guacamole/guacamole-0.9.14.war /config/tomcat8/webapps/ROOT.war  # guacamole client
     $ sed -i 's/Connector port="8080"/Connector port="8081"/g' /config/tomcat8/conf/server.xml  # 修改默认端口为 8081
@@ -415,6 +417,7 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
 
 .. code-block:: shell
 
+    # 勿多次执行以下环境设置
     $ export JUMPSERVER_SERVER=http://127.0.0.1:8080  # http://127.0.0.1:8080 指 jumpserver 访问地址
     $ echo "export JUMPSERVER_SERVER=http://127.0.0.1:8080" >> ~/.bashrc
 
@@ -450,6 +453,7 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
     enabled=1
     gpgkey=https://nginx.org/keys/nginx_signing.key
 
+    $ yum makecache fast
     $ yum install -y nginx
     $ rm -rf /etc/nginx/conf.d/default.conf
     $ systemctl enable nginx

docs/setup_by_ubuntu.rst

@@ -341,7 +341,10 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
     $ apt-get -y install libtool autoconf
     $ apt-get -y install libcairo2-dev libjpeg-turbo8-dev libpng12-dev libossp-uuid-dev
     $ apt-get -y install libavcodec-dev libavutil-dev libswscale-dev libfreerdp-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev libvorbis-dev libwebp-dev ghostscript
-    $ ln -s /usr/local/lib/freerdp /usr/lib/x86_64-linux-gnu/freerdp
+    $ ln -s /usr/local/lib/freerdp/guacai.so /usr/lib64/freerdp/guacai.so
+    $ ln -s /usr/local/lib/freerdp/guacdr.so /usr/lib64/freerdp/guacdr.so
+    $ ln -s /usr/local/lib/freerdp/guacsnd.so /usr/lib64/freerdp/guacsnd.so
+    $ ln -s /usr/local/lib/freerdp/guacsvc.so /usr/lib64/freerdp/guacsvc.so
     $ apt-get -y install default-jre default-jdk
 
 **5.2 编译安装 guacamole 服务**
@@ -378,10 +381,10 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
 .. code-block:: shell
 
     $ cd /config
-    $ wget http://mirror.bit.edu.cn/apache/tomcat/tomcat-8/v8.5.39/bin/apache-tomcat-8.5.39.tar.gz
-    $ tar xf apache-tomcat-8.5.39.tar.gz
-    $ rm -rf apache-tomcat-8.5.39.tar.gz
-    $ mv apache-tomcat-8.5.39 tomcat8
+    $ wget http://mirrors.tuna.tsinghua.edu.cn/apache/tomcat/tomcat-8/v8.5.40/bin/apache-tomcat-8.5.40.tar.gz
+    $ tar xf apache-tomcat-8.5.40.tar.gz
+    $ rm -rf apache-tomcat-8.5.40.tar.gz
+    $ mv apache-tomcat-8.5.40 tomcat8
     $ rm -rf /config/tomcat8/webapps/*
     $ ln -sf /opt/docker-guacamole/guacamole-0.9.14.war /config/tomcat8/webapps/ROOT.war  # guacamole client
     $ sed -i 's/Connector port="8080"/Connector port="8081"/g' /config/tomcat8/conf/server.xml  # 修改默认端口为 8081
@@ -391,6 +394,7 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
 
 .. code-block:: shell
 
+    # 勿多次执行以下环境设置
     $ export JUMPSERVER_SERVER=http://127.0.0.1:8080  # http://127.0.0.1:8080 指 jumpserver 访问地址
     $ echo "export JUMPSERVER_SERVER=http://127.0.0.1:8080" >> ~/.bashrc
 

docs/upgrade.rst

@@ -387,10 +387,10 @@
 .. code-block:: shell
 
     $ cd /opt/coco
-    $ git pull
     $ source /opt/py3/bin/activate
     $ ./cocod stop
     $ mv conf.py conf.bak
+    $ git pull
 
     # 更新 config.yml, 请根据你原备份的 conf.bak 内容进行修改
     $ cp config_example.yml config.yml
@@ -472,9 +472,9 @@
 .. code-block:: shell
 
     $ cd /opt/docker-guacamole
-    $ git pull
     $ /etc/init.d/guacd stop
     $ sh /config/tomcat8/bin/shutdown.sh
+    $ git pull
     $ ln -sf /opt/docker-guacamole/guacamole-0.9.14.war /config/tomcat8/webapps/ROOT.war
     $ ln -sf /opt/docker-guacamole/guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar
 
@@ -637,10 +637,10 @@
 .. code-block:: shell
 
     $ cd /opt/coco
-    $ git pull
     $ source /opt/py3/bin/activate
     $ ./cocod stop
     $ mv conf.py conf.bak
+    $ git pull
 
     # 更新 config.yml, 请根据你原备份的 conf.bak 内容进行修改
     $ cp config_example.yml config.yml
@@ -720,9 +720,9 @@
 .. code-block:: shell
 
     $ cd /opt/docker-guacamole
-    $ git pull
     $ /etc/init.d/guacd stop
     $ sh /config/tomcat8/bin/shutdown.sh
+    $ git pull
     $ ln -sf /opt/docker-guacamole/guacamole-0.9.14.war /config/tomcat8/webapps/ROOT.war
     $ ln -sf /opt/docker-guacamole/guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar
 
@@ -884,10 +884,10 @@
 .. code-block:: shell
 
     $ cd /opt/coco
-    $ git pull
     $ source /opt/py3/bin/activate
     $ ./cocod stop
     $ mv conf.py conf.bak
+    $ git pull
 
     # 更新 config.yml, 请根据你原备份的 config.yml 内容进行修改
     $ cp config_example.yml config.yml
@@ -967,9 +967,9 @@
 .. code-block:: shell
 
     $ cd /opt/docker-guacamole
-    $ git pull
     $ /etc/init.d/guacd stop
     $ sh /config/tomcat8/bin/shutdown.sh
+    $ git pull
     $ ln -sf /opt/docker-guacamole/guacamole-0.9.14.war /config/tomcat8/webapps/ROOT.war
     $ ln -sf /opt/docker-guacamole/guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar
 
@@ -1036,6 +1036,7 @@
 
     $ cd /opt/jumpserver
     $ source /opt/py3/bin/activate
+    $ ./jms stop
     $ git pull
     $ pip install -r requirements/requirements.txt
 
@@ -1049,8 +1050,9 @@
 .. code-block:: shell
 
     $ cd /opt/coco
-    $ git pull
     $ source /opt/py3/bin/activate
+    $ ./cocod stop
+    $ git pull
     $ pip install -r requirements/requirements.txt
     $ ./cocod start -d
 
@@ -1114,6 +1116,7 @@
 
     $ cd /opt/jumpserver
     $ source /opt/py3/bin/activate
+    $ ./jms stop
     $ git pull
     $ pip install -r requirements/requirements.txt
 
@@ -1127,8 +1130,9 @@
 .. code-block:: shell
 
     $ cd /opt/coco
-    $ git pull
     $ source /opt/py3/bin/activate
+    $ ./cocod stop
+    $ git pull
     $ pip install -r requirements/requirements.txt
     $ ./cocod start -d