diff --git a/docs/change_log.rst b/docs/change_log.rst index 905a876606ceacc8a6bf465c284d1accb8ea56ae..f5bb01fa3c178e261cb68c11e98d0d4523ad7577 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -256,3 +256,10 @@ * å¢žåŠ ssh用户黑åå•和白åå• * lunaæ”¯æŒæœç´¢æ”¯æŒIP * 优化一些内容 + +1.4.2 +------------------------ +2018å¹´10月8æ—¥ + +* 支æŒweb sftp,支æŒè·¨èµ„产å¤åˆ¶ç²˜è´´æ–‡ä»¶ +* 优化一些内容 diff --git a/docs/distributed_02.rst b/docs/distributed_02.rst index 2a714467450cc5d8acf5188e71525553c06c9524..415335a7d83aac48378bd1b06ed89748d601eb01 100644 --- a/docs/distributed_02.rst +++ b/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; diff --git a/docs/dockerinstall.rst b/docs/dockerinstall.rst index aa3cdb96b92ed8b1b93cbca076959507be4621ec..be05222c8bced2c40691d33bd9e96ee72e1bb1f1 100644 --- a/docs/dockerinstall.rst +++ b/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/>`_ diff --git a/docs/setup_by_centos7.rst b/docs/setup_by_centos7.rst index a44d948ac614f3aec0a42af382ccd8fc6b2fa860..46839536e5539d6476b60e0fa924fde562ad0986 100644 --- a/docs/setup_by_centos7.rst +++ b/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; diff --git a/docs/setup_by_local.rst b/docs/setup_by_local.rst index 8af1b30d7ba51cbce20e9693daeca021352d53e7..f867b98b47579ac1af6f946542153ed13ebde4d4 100644 --- a/docs/setup_by_local.rst +++ b/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; diff --git a/docs/setup_by_ubuntu.rst b/docs/setup_by_ubuntu.rst index 10d1b030fe8ed9b0f2bdaf908cefcedaac767737..3bc81808dbc53f21df6c45285cf9646da0b6630a 100644 --- a/docs/setup_by_ubuntu.rst +++ b/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; diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index d720fb57b9a5c4cc85973b5dded66cfea55f02eb..987c43983d66d26c92efb2a71c63f5dc3e22b721 100644 --- a/docs/step_by_step.rst +++ b/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; diff --git a/docs/upgrade.rst b/docs/upgrade.rst index 48a4bb78d2b0ca13865115fcc827a73c96242f72..35bf0f7795cd78a3bb6c006479aa0813a4f9a636 100644 --- a/docs/upgrade.rst +++ b/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