From 4fbb4dfb551b4adf79afd46df53a844605bebbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=87=E6=83=B3=E6=8E=A7?= <704564722@qq.com> Date: Sun, 26 Mar 2017 13:35:26 +0800 Subject: [PATCH 1/8] Update install.md --- docs/install.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/install.md b/docs/install.md index b32c95720..9c2a44500 100644 --- a/docs/install.md +++ b/docs/install.md @@ -15,7 +15,9 @@ **1.2 安装Python** - 这里可以参考 [https://segmentfault.com/a/1190000000654227][1]也可以下载我编译的rpm版本: + 这里可以参考 [https://segmentfault.com/a/1190000000654227][1] + + 也可以下载我编译的rpm版本: $ wget http://repo.jumpserver.org/python27-2.7.13-1.el6.x86_64.rpm From f7c35fde2dffe4332dbbb5e91b4764f52dda4cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=87=E6=83=B3=E6=8E=A7?= <704564722@qq.com> Date: Sun, 26 Mar 2017 13:38:48 +0800 Subject: [PATCH 2/8] Update install.md --- docs/install.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/install.md b/docs/install.md index 9c2a44500..a04acfff5 100644 --- a/docs/install.md +++ b/docs/install.md @@ -15,9 +15,8 @@ **1.2 安装Python** - 这里可以参考 [https://segmentfault.com/a/1190000000654227][1] - - 也可以下载我编译的rpm版本: +''' + 这里可以参考 [https://segmentfault.com/a/1190000000654227][1]也可以下载我编译的rpm版本: $ wget http://repo.jumpserver.org/python27-2.7.13-1.el6.x86_64.rpm @@ -28,6 +27,7 @@ $ python2.7 -V Python 2.7.13 +''' #### 二. Jumpserver安装 From dd5b1097f20b249e0c07ec955573923bdfc5fdc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=87=E6=83=B3=E6=8E=A7?= <704564722@qq.com> Date: Sun, 26 Mar 2017 13:40:27 +0800 Subject: [PATCH 3/8] Update install.md --- docs/install.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/install.md b/docs/install.md index a04acfff5..691166ce2 100644 --- a/docs/install.md +++ b/docs/install.md @@ -15,7 +15,8 @@ **1.2 安装Python** -''' + ''' + 这里可以参考 [https://segmentfault.com/a/1190000000654227][1]也可以下载我编译的rpm版本: $ wget http://repo.jumpserver.org/python27-2.7.13-1.el6.x86_64.rpm @@ -27,7 +28,8 @@ $ python2.7 -V Python 2.7.13 -''' + + ''' #### 二. Jumpserver安装 From ef8599b836eadff5d91d5b1496cc5a75b4551a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=87=E6=83=B3=E6=8E=A7?= <704564722@qq.com> Date: Sun, 26 Mar 2017 13:46:26 +0800 Subject: [PATCH 4/8] Update install.md --- docs/install.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/docs/install.md b/docs/install.md index 691166ce2..d8aac54ce 100644 --- a/docs/install.md +++ b/docs/install.md @@ -9,15 +9,13 @@ #### 一. 环境准备 -**1.1 安装基本工具和库** +##### 1.1 安装基本工具和库 $ yum -y install sqlite-devel git epel-release -**1.2 安装Python** +##### 1.2 安装Python - ''' - - 这里可以参考 [https://segmentfault.com/a/1190000000654227][1]也可以下载我编译的rpm版本: +这里可以参考 [https://segmentfault.com/a/1190000000654227][1] 也可以下载我编译的rpm版本: $ wget http://repo.jumpserver.org/python27-2.7.13-1.el6.x86_64.rpm @@ -28,8 +26,6 @@ $ python2.7 -V Python 2.7.13 - - ''' #### 二. Jumpserver安装 From d700c448c6d8a5e2ab653c13d3ffbac6977cab98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=87=E6=83=B3=E6=8E=A7?= <704564722@qq.com> Date: Sun, 26 Mar 2017 13:50:10 +0800 Subject: [PATCH 5/8] Update install.md --- docs/install.md | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/docs/install.md b/docs/install.md index d8aac54ce..d80e699ac 100644 --- a/docs/install.md +++ b/docs/install.md @@ -17,27 +17,25 @@ 这里可以参考 [https://segmentfault.com/a/1190000000654227][1] 也可以下载我编译的rpm版本: - $ wget http://repo.jumpserver.org/python27-2.7.13-1.el6.x86_64.rpm - - $ yum localinstall -y python27-2.7.13-1.el6.x86_64.rpm - - $ bash - - $ python2.7 -V - + $ wget http://repo.jumpserver.org/python27-2.7.13-1.el6.x86_64.rpm + $ yum localinstall -y python27-2.7.13-1.el6.x86_64.rpm + $ bash + $ python2.7 -V Python 2.7.13 #### 二. Jumpserver安装 -**2.1 下载仓库代码** +##### 2.1 下载仓库代码 -``` -$ cd /opt -$ git clone [https://github.com/jumpserver/jumpserver.git][2] -$ cd jumpserver -$ git checkout dev -``` -**2.2 安装依赖** + $ cd /opt + + $ git clone https://github.com/jumpserver/jumpserver.git + + $ cd jumpserver + + $ git checkout dev + +##### 2.2 安装依赖 ``` $ cd requirements From 5984b0b57959684d3a53e4082380cca939899cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=87=E6=83=B3=E6=8E=A7?= <704564722@qq.com> Date: Sun, 26 Mar 2017 13:54:11 +0800 Subject: [PATCH 6/8] Update install.md --- docs/install.md | 62 +++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/docs/install.md b/docs/install.md index d80e699ac..73396ff3f 100644 --- a/docs/install.md +++ b/docs/install.md @@ -28,51 +28,43 @@ ##### 2.1 下载仓库代码 $ cd /opt - $ git clone https://github.com/jumpserver/jumpserver.git - $ cd jumpserver - $ git checkout dev ##### 2.2 安装依赖 -``` -$ cd requirements -$ sudo yum -y install `cat rpm_requirements.txt` -$ pip2.7 install -r requirements.txt -i https://pypi.doubanio.com/simple -``` + $ cd requirements + $ sudo yum -y install `cat rpm_requirements.txt` + $ pip2.7 install -r requirements.txt -i https://pypi.doubanio.com/simple -**2.3 准备配置文件** -``` -$ cd .. -$ cp config_example.py config.py -$ vim config.py - -// 默认使用的是 DevelpmentConfig 所以应该去修改这部分 -class DevelopmentConfig(Config): -EMAIL_HOST = 'smtp.exmail.qq.com' -EMAIL_PORT = 465 -EMAIL_HOST_USER = 'ask@jumpserver.org' -EMAIL_HOST_PASSWORD = 'xxx' -EMAIL_USE_SSL = True // 端口是 465 设置 True 否则 False -EMAIL_USE_TLS = False // 端口是 587 设置为 True 否则 False -SITE_URL = 'http://localhost:8080' // 发送邮件会使用这个地址 -``` +##### 2.3 准备配置文件 -**2.4 初始化数据库** -``` -$ cd utils -$ sh make_migrations.sh -$ sh init_db.sh -``` + $ cd .. + $ cp config_example.py config.py + $ vim config.py -**2.5 安装redis server** -``` -`$ yum -y install redis -$ service redis start -``` + // 默认使用的是 DevelpmentConfig 所以应该去修改这部分 + class DevelopmentConfig(Config): + EMAIL_HOST = 'smtp.exmail.qq.com' + EMAIL_PORT = 465 + EMAIL_HOST_USER = 'ask@jumpserver.org' + EMAIL_HOST_PASSWORD = 'xxx' + EMAIL_USE_SSL = True // 端口是 465 设置 True 否则 False + EMAIL_USE_TLS = False // 端口是 587 设置为 True 否则 False + SITE_URL = 'http://localhost:8080' // 发送邮件会使用这个地址 + +##### 2.4 初始化数据库 + + $ cd utils + $ sh make_migrations.sh + $ sh init_db.sh + +##### 2.5 安装redis server + + $ yum -y install redis + $ service redis start **2.6 启动** ``` From 4714d5d42fe67984742d4a03334949f0834c1b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=87=E6=83=B3=E6=8E=A7?= <704564722@qq.com> Date: Sun, 26 Mar 2017 13:55:01 +0800 Subject: [PATCH 7/8] Update install.md --- docs/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install.md b/docs/install.md index 73396ff3f..32d8e666f 100644 --- a/docs/install.md +++ b/docs/install.md @@ -95,7 +95,7 @@ $ python2.7 run_server.py **3.1 下载代码库** ``` $ cd /opt -$[git clone https://github.com/jumpserver/coco.git][3] +$ git clone https://github.com/jumpserver/coco.git ``` **3.2 安装依赖** From 2e31cf51f3dfc3ab8d77219024469d405ff7ac21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=87=E6=83=B3=E6=8E=A7?= <704564722@qq.com> Date: Sun, 26 Mar 2017 14:56:17 +0800 Subject: [PATCH 8/8] Update install.md --- docs/install.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/install.md b/docs/install.md index 32d8e666f..3b80ca69e 100644 --- a/docs/install.md +++ b/docs/install.md @@ -2,7 +2,8 @@ ### 环境 -- 系统: CentOS 6.5 x86\_64 mini_ - Python: 版本 2.7.13 (未来支持 3.5) +- 系统: CentOS 6.5 x86\_64 mini +- Python: 版本 2.7.13 (未来支持 3.5) - 安装目录 - /opt/jumpserver - /opt/coco