Merge pull request #1879 from wojiushixiaobai/docs

[Update]更新1.4.2文档

docs/change_log.rst

@@ -256,3 +256,10 @@
 * 增加ssh用户黑名单和白名单
 * luna支持搜索支持IP
 * 优化一些内容
+
+1.4.2
+------------------------
+2018年10月8日
+
+* 支持web sftp，支持跨资产复制粘贴文件
+* 优化一些内容

docs/distributed_02.rst

@@ -52,7 +52,7 @@
 
     # 下载 luna
     $ cd /opt
-    $ wget https://github.com/jumpserver/luna/releases/download/1.4.1/luna.tar.gz
+    $ wget https://github.com/jumpserver/luna/releases/download/1.4.2/luna.tar.gz
     $ tar xvf luna.tar.gz
     $ chown -R root:root luna
 
@@ -188,6 +188,14 @@
             # proxy_next_upstream http_500 http_502 http_503 http_504 http_404;
         }
 
+        location /coco/ {
+            proxy_pass       http://cocows/coco/;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            access_log off;
+        }
+
         location /guacamole/ {
             proxy_pass       http://guacamole/;  #  guacamole
             proxy_buffering off;

docs/dockerinstall.rst

@@ -4,7 +4,7 @@ Docker 安装
 Jumpserver 封装了一个 All in one Docker，可以快速启动。该镜像集成了所需要的组件(Windows组件未暂未集成)，也支持使用外置 Database 和 Redis
 
 Tips: 不建议在生产中使用, 因为所有软件都打包到一个Docker中了，不是Docker最佳实践，
-生产中请使用 详细安装 `CentOS <step_by_step.html>`_  `Ubuntu <setup_by_ubuntu.html>`_
+生产中请使用 详细安装 `CentOS <step_by_step.rst>`_  `Ubuntu <setup_by_ubuntu.rst>`_
 
 Docker 安装见: `Docker官方安装文档 <https://docs.docker.com/install/>`_
 

docs/setup_by_centos7.rst

@@ -301,7 +301,7 @@ CentOS 7 安装文档
 
     # 安装 Web Terminal 前端: Luna  需要 Nginx 来运行访问 访问（https://github.com/jumpserver/luna/releases）下载对应版本的 release 包，直接解压，不需要编译
     $ cd /opt
-    $ wget https://github.com/jumpserver/luna/releases/download/1.4.1/luna.tar.gz
+    $ wget https://github.com/jumpserver/luna/releases/download/1.4.2/luna.tar.gz
     $ tar xvf luna.tar.gz
     $ chown -R root:root luna
 
@@ -351,6 +351,14 @@ CentOS 7 安装文档
             access_log off;
         }
 
+        location /coco/ {
+            proxy_pass       http://localhost:5000/coco/;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            access_log off;
+        }
+
         location /guacamole/ {
             proxy_pass       http://localhost:8081/;  # 如果docker安装在别的服务器, 请填写它的ip
             proxy_buffering off;

docs/setup_by_local.rst

@@ -355,6 +355,14 @@ CentOS 7 组件离线安装文档
             access_log off;
         }
 
+        location /coco/ {
+            proxy_pass       http://localhost:5000/coco/;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            access_log off;
+        }
+
         location /guacamole/ {
             proxy_pass       http://localhost:8081/;  # 如果docker安装在别的服务器, 请填写它的ip
             proxy_buffering off;

docs/setup_by_ubuntu.rst

@@ -370,7 +370,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问
 ::
 
     $ cd /opt/
-    $ wget https://github.com/jumpserver/luna/releases/download/1.4.1/luna.tar.gz
+    $ wget https://github.com/jumpserver/luna/releases/download/1.4.2/luna.tar.gz
     $ tar xvf luna.tar.gz
     $ chown -R root:root luna
 
@@ -461,6 +461,14 @@ Luna 已改为纯前端，需要 Nginx 来运行访问
             access_log off;
         }
 
+        location /coco/ {
+            proxy_pass       http://localhost:5000/coco/;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            access_log off;
+        }
+
         location /guacamole/ {
             proxy_pass       http://localhost:8081/;  # 如果guacamole安装在别的服务器，请填写它的ip
             proxy_buffering off;

docs/step_by_step.rst

@@ -406,7 +406,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问
 ::
 
     $ cd /opt
-    $ wget https://github.com/jumpserver/luna/releases/download/1.4.1/luna.tar.gz
+    $ wget https://github.com/jumpserver/luna/releases/download/1.4.2/luna.tar.gz
     $ tar xvf luna.tar.gz
     $ chown -R root:root luna
 
@@ -508,6 +508,14 @@ Luna 已改为纯前端，需要 Nginx 来运行访问
             access_log off;
         }
 
+        location /coco/ {
+            proxy_pass       http://localhost:5000/coco/;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            access_log off;
+        }
+
         location /guacamole/ {
             proxy_pass       http://localhost:8081/;  # 如果guacamole安装在别的服务器，请填写它的ip
             proxy_buffering off;

docs/upgrade.rst

@@ -52,7 +52,20 @@
     $ cd ../utils && sh make_migrations.sh
 
     $ cd ../ && ./jms start all
- 
+
+    # 任意版本升级到 1.4.2 版本，需要修改 nginx 配置
+    $ vim /etc/nginx/conf.d/jumpserver.conf
+
+    ...
+    location /coco/ {
+        proxy_pass       http://localhost:5000/coco/;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        access_log off;
+    }
+    ...
+
 2. 升级 Coco（如果是新开的终端，别忘了 source /opt/py3/bin/activate）
 
 ::
@@ -76,7 +89,7 @@
 ::
 
     $ cd /opt
-    $ wget https://github.com/jumpserver/luna/releases/download/1.4.1/luna.tar.gz
+    $ wget https://github.com/jumpserver/luna/releases/download/1.4.2/luna.tar.gz
     $ tar xvf luna.tar.gz
     $ chown -R root:root luna