diff --git a/docs/admin_guide.rst b/docs/admin_guide.rst index df59969cc..b6641a2da 100644 --- a/docs/admin_guide.rst +++ b/docs/admin_guide.rst @@ -6,5 +6,6 @@ .. toctree:: :maxdepth: 1 + admin_instruction admin_user admin_asset diff --git a/docs/intro.rst b/docs/admin_instruction.rst similarity index 64% rename from docs/intro.rst rename to docs/admin_instruction.rst index a8810e14f..d94200bfc 100644 --- a/docs/intro.rst +++ b/docs/admin_instruction.rst @@ -1,15 +1,5 @@ -简介 -============ - -Jumpserver是混合云下更好用的堡垒机, 分布式架构设计无限扩展,轻松对接混合云资产,支持使用云存储(AWS S3, ES等)存储录像、命令 - -Jumpserver颠覆传统堡垒机, 无主机和并发数量限制,支持水平扩容,FIT2CLOUD提供完备的商业服务支持,用户无后顾之忧 - -Jumpserver拥有极致的用户体验, 极致UI体验,容器化的部署方式,部署过程方便快捷,可持续升级 - - 组件说明 -++++++++++++++++++++++++ +================= Jumpserver ``````````` @@ -45,7 +35,7 @@ Jumpserver API Python SDK,Coco目前使用该SDK与Jumpserver API交互 `Github `__ -组件架构图 -++++++++++++++++++++++++ +架构图 + .. image:: _static/img/structure.png - :alt: 组件架构图 + :alt: 组件架构图 \ No newline at end of file diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index db4b08608..8c669776b 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -230,16 +230,16 @@ Luna已改为纯前端,需要nginx来运行访问 五. 安装Windows支持组件 ~~~~~~~~~~~~~~~~~~~~~~~ -使用docker启动 guacamole +因为手动安装 guacamole 组件比较复杂,这里提供打包好的docker使用, 启动 guacamole .. code:: shell - docker run \ - -p 8080:8080 \ - -e JUMPSERVER_SERVER=http://:8080 \ + docker run -d \ + -p 8081:8080 \ + -e JUMPSERVER_SERVER=http://localhost:8080 \ jumpserver/guacamole -这里所需要注意的是guacamole暴露出来的端口是8080,若与jumpserver部署在同一主机上自定义一下。 +这里所需要注意的是guacamole暴露出来的端口是8081,若与主机上其他端口冲突请自定义一下。 修改JUMPSERVER_SERVER的配置,填上jumpserver的内网地址 @@ -275,13 +275,20 @@ Luna已改为纯前端,需要nginx来运行访问 location /socket.io/ { proxy_pass http://localhost:5000/socket.io/; + proxy_buffering off; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; } location /guacamole/ { - proxy_pass http://:8080/; + proxy_pass http://localhost:8081/; + proxy_buffering off; + proxy_http_version 1.1; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $http_connection; + access_log off; } location / {