From 422990a992acee09ff10e4ca47c5ef7be89f4a68 Mon Sep 17 00:00:00 2001 From: fit2cloud-fengyi Date: Fri, 9 Mar 2018 10:33:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20venv=20=E5=88=B0=20ign?= =?UTF-8?q?ore=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index dc51315af..488f8a776 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .env env env* +venv dist build *.egg From b19a0e1cdf07bef36de4af1aea6cea3245ebd0d1 Mon Sep 17 00:00:00 2001 From: fit2cloud-fengyi Date: Mon, 12 Mar 2018 10:33:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4faq=E5=92=8C=E4=B9=85?= =?UTF-8?q?=E7=9A=84intro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/contact.rst | 2 +- docs/faq.rst | 2 -- docs/intro.rst | 51 ------------------------------------------------ 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 docs/faq.rst delete mode 100644 docs/intro.rst diff --git a/docs/contact.rst b/docs/contact.rst index 789207779..b537185a7 100644 --- a/docs/contact.rst +++ b/docs/contact.rst @@ -6,7 +6,7 @@ https://market.aliyun.com/products/53690006/cmgj026011.html -QQ群 +QQ 群 ~~~~~~~~ 群1: 390139816 diff --git a/docs/faq.rst b/docs/faq.rst deleted file mode 100644 index d02cca126..000000000 --- a/docs/faq.rst +++ /dev/null @@ -1,2 +0,0 @@ -FAQ -+++++++++++++++++++++ \ No newline at end of file diff --git a/docs/intro.rst b/docs/intro.rst deleted file mode 100644 index a8810e14f..000000000 --- a/docs/intro.rst +++ /dev/null @@ -1,51 +0,0 @@ -简介 -============ - -Jumpserver是混合云下更好用的堡垒机, 分布式架构设计无限扩展，轻松对接混合云资产，支持使用云存储（AWS S3, ES等）存储录像、命令 - -Jumpserver颠覆传统堡垒机, 无主机和并发数量限制，支持水平扩容，FIT2CLOUD提供完备的商业服务支持，用户无后顾之忧 - -Jumpserver拥有极致的用户体验, 极致UI体验，容器化的部署方式，部署过程方便快捷，可持续升级 - - -组件说明 -++++++++++++++++++++++++ - -Jumpserver -``````````` -现指Jumpserver管理后台，是核心组件(Core), 使用 Django Class Based View 风格开发，支持Restful API。 - -`Github `_ - - -Coco -```````` -实现了SSH Server 和 Web Terminal Server的组件，提供ssh和websocket接口, 使用 Paramiko 和 Flask 开发。 - - -`Github `__ - - -Luna -```````` -现在是Web Terminal前端，计划前端页面都由该项目提供，Jumpserver只提供API，不再负责后台渲染html等。 - -`Github `__ - - -Guacamole -``````````` -Apache 跳板机项目，Jumpserver使用其组件实现RDP功能，Jumpserver并没有修改其代码而是添加了额外的插件，支持Jumpserver调用 - - -Jumpserver-python-sdk -``````````````````````` -Jumpserver API Python SDK，Coco目前使用该SDK与Jumpserver API交互 - -`Github `__ - - -组件架构图 -++++++++++++++++++++++++ -.. image:: _static/img/structure.png - :alt: 组件架构图 From 5d88c7b7798d49c5c09fa1d92e1effdc5e6f713a Mon Sep 17 00:00:00 2001 From: fit2cloud-fengyi Date: Wed, 14 Mar 2018 13:09:51 +0800 Subject: [PATCH 3/3] add git install --- docs/step_by_step.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index 1221c2b85..8a78c19de 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -26,7 +26,7 @@ :: - $ yum -y install wget sqlite-devel xz gcc automake zlib-devel openssl-devel epel-release + $ yum -y install wget sqlite-devel xz gcc automake zlib-devel openssl-devel epel-release git **1.2 编译安装**