Merge pull request #1891 from wojiushixiaobai/docs

[Update]修改文档

docs/distributed_04.rst

@@ -61,7 +61,7 @@
     $ yum -y install $(cat /opt/jumpserver/requirements/rpm_requirements.txt)
 
     # 安装 Python 库依赖
-    $ pip install --upgrade pip && pip install -r /opt/jumpserver/requirements/requirements.txt -i https://pypi.python.org/simple
+    $ pip install --upgrade pip && pip install -r /opt/jumpserver/requirements/requirements.txt
 
     # 修改 jumpserver 配置文件
     $ cd /opt/jumpserver

docs/distributed_05.rst

@@ -53,7 +53,7 @@
     $ yum -y install $(cat /opt/coco/requirements/rpm_requirements.txt)
 
     # 安装 Python 库依赖
-    $ pip install --upgrade pip && pip install -r /opt/coco/requirements/requirements.txt -i https://pypi.python.org/simple
+    $ pip install --upgrade pip && pip install -r /opt/coco/requirements/requirements.txt
 
     # # 修改 Coco 配置文件
     $ cd /opt/coco
@@ -156,7 +156,8 @@
 
     # 运行 coco
     $ cd /opt/coco
-    $ ./cocod start all  # 后台运行使用 -d 参数./cocod start -d
+    $ mkdir keys
+    $ ./cocod start  # 后台运行使用 -d 参数./cocod start -d
     # 新版本更新了运行脚本，使用方式./cocod start|stop|status 后台运行请添加 -d 参数
 
     # 访问 http://192.168.100.100/terminal/terminal/ 接受 coco 注册

docs/faq_install.rst

@@ -91,7 +91,7 @@
 
     # 如果已经在 py3 虚拟环境下
     $ cd /opt/coco/
-    $ pip install -r requirements/requirements.txt -i https://pypi.python.org/simple
+    $ pip install -r requirements/requirements.txt
     # 然后重新执行 ./cocod start 即可
 
 12. 执行 ./cocod start 后提示 Failed register terminal xxxx exist already

docs/setup_by_centos7.rst

@@ -98,8 +98,8 @@ CentOS 7 安装文档
 
     # 安装 Python 库依赖
     $ pip install --upgrade pip
-    $ pip install -r /opt/jumpserver/requirements/requirements.txt -i https://pypi.python.org/simple
-    $ pip install -r /opt/coco/requirements/requirements.txt -i https://pypi.python.org/simple
+    $ pip install -r /opt/jumpserver/requirements/requirements.txt
+    $ pip install -r /opt/coco/requirements/requirements.txt
 
 ::
 
@@ -201,6 +201,7 @@ CentOS 7 安装文档
 
     # 修改 Coco 配置文件
     $ cd /opt/coco
+    $ mkdir keys
     $ cp conf_example.py conf.py
     $ vi conf.py
 

docs/setup_by_local.rst

@@ -198,6 +198,7 @@ CentOS 7 组件离线安装文档
 
     # 修改 Coco 配置文件
     $ cd /opt/coco
+    $ mkdir keys
     $ cp conf_example.py conf.py
     $ vi conf.py
 

docs/setup_by_ubuntu.rst

@@ -88,7 +88,7 @@
 
 ::
 
-    $ pip install -r requirements.txt -i https://pypi.python.org/simple
+    $ pip install -r requirements.txt
 
 **2.4 安装 Redis, Jumpserver 使用 Redis 做 cache 和 celery broke**
 
@@ -248,13 +248,14 @@
 ::
 
     $ cd /opt/coco/requirements
-    $ pip install -r requirements.txt -i https://pypi.python.org/simple
+    $ pip install -r requirements.txt
 
 **3.3 查看配置文件并运行**
 
 ::
 
     $ cd /opt/coco
+    $ mkdir keys
     $ cp conf_example.py conf.py  # 如果 coco 与 jumpserver 分开部署，请手动修改 conf.py
     $ vi conf.py
 

docs/step_by_step.rst

@@ -110,7 +110,7 @@ Yum 加速设置请参考 <http://mirrors.163.com/.help/centos.html>
 
 ::
 
-    $ pip install -r requirements.txt -i https://pypi.python.org/simple
+    $ pip install -r requirements.txt
 
 **2.4 安装 Redis, Jumpserver 使用 Redis 做 cache 和 celery broke**
 
@@ -284,13 +284,14 @@ Yum 加速设置请参考 <http://mirrors.163.com/.help/centos.html>
 
     $ cd /opt/coco/requirements
     $ yum -y  install $(cat rpm_requirements.txt)
-    $ pip install -r requirements.txt -i https://pypi.python.org/simple
+    $ pip install -r requirements.txt
 
 **3.3 修改配置文件并运行**
 
 ::
 
     $ cd /opt/coco
+    $ mkdir keys
     $ cp conf_example.py conf.py  # 如果 coco 与 jumpserver 分开部署，请手动修改 conf.py
     $ vi conf.py
 

docs/upgrade.rst

@@ -37,7 +37,7 @@
     $ cp config_example.py config.py
     $ vim config.py  # 参考安装文档进行修改
 
-    $ pip install -r requirements/requirements.txt -i https://pypi.python.org/simple
+    $ pip install -r requirements/requirements.txt
     $ cd utils && sh make_migrations.sh
 
     # 如果执行 sh make_migrations.sh 时有红色文字提示 Run 'manage.py make_migrations' 和 'manage.py migrate' ，则需要执行下面4条命令，没有则忽略这一步
@@ -86,7 +86,7 @@
     # 如果 coco 目录非默认位置请手动修改
     $ cd /opt/coco
     $ ./cocod stop
-    $ git pull && pip install -r requirements/requirements.txt -i https://pypi.python.org/simple
+    $ git pull && pip install -r requirements/requirements.txt
 
     # coco 版本小于 1.4.1 升级到最新版本请使用新的 conf.py （当前版本小于 1.4.1 需要执行此步骤）
     $ mv conf.py coco.bak
@@ -194,7 +194,7 @@
 ::
 
    $ cd /opt/jumpserver
-   $ pip install -r requirements/requirements.txt -i https://pypi.python.org/simple
+   $ pip install -r requirements/requirements.txt
    $ cd utils && sh make_migrations.sh
 
 
@@ -235,7 +235,7 @@ coco 是无状态的，备份 keys 目录即可
 
 ::
 
-   $ git pull &&  pip install -r requirements/requirements.txt -i https://pypi.python.org/simple
+   $ git pull &&  pip install -r requirements/requirements.txt
 
 
 **Luna**