From ced1c586323705b74496f328635dc33946b1cd71 Mon Sep 17 00:00:00 2001
From: wojiushixiaobai <296015668@qq.com>
Date: Fri, 23 Mar 2018 17:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9jumpserver=E5=92=8Ccoco?=
 =?UTF-8?q?=E7=9A=84=E8=84=9A=E6=9C=AC=E4=BD=BF=E7=94=A8=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/setup_by_ubuntu.rst | 6 ++----
 docs/step_by_step.rst    | 9 +++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/setup_by_ubuntu.rst b/docs/setup_by_ubuntu.rst
index 37804d2a..cbcedd53 100644
--- a/docs/setup_by_ubuntu.rst
+++ b/docs/setup_by_ubuntu.rst
@@ -136,7 +136,7 @@
 ::
 
     $ cd /opt/jumpserver
-    $ python run_server.py all
+    $ ./jms start all  # 新版本更新了运行脚本,使用方式./jms start|stop|status|restart all
 
 运行不报错,请浏览器访问 http://192.168.244.144:8080/
 (这里只是 Jumpserver, 没有 Web Terminal,所以访问 Web Terminal 会报错)
@@ -170,9 +170,7 @@
 
     $ cd /opt/coco
     $ cp conf_example.py conf.py
-    $ python run_server.py
-
-    # 1.0.0版本中可以使用 jms 脚本让jumpserver在后台运行,使用方式 ./jms start|stop|restart all
+    $ ./cocod start all  # 新版本更新了运行脚本,使用方式./cocod start|stop|status|restart
 
 这时需要去 Jumpserver 管理后台-会话管理-终端管理(http://192.168.244.144:8080/terminal/terminal/)接受 Coco 的注册
 
diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst
index 112938c9..049e7726 100644
--- a/docs/step_by_step.rst
+++ b/docs/step_by_step.rst
@@ -18,7 +18,7 @@
     # 修改字符集,否则可能报 input/output error的问题,因为日志里打印了中文
     $ localedef -c -f UTF-8 -i zh_CN zh_CN.UTF-8
     $ export LC_ALL=zh_CN.UTF-8
-    $ echo 'LANG=zh_CN.UTF-8' > /etc/sysconfig/i18n
+    $ echo 'LANG=zh_CN.UTF-8' > /etc/locale.conf
 
     # CentOS6
     $ setenforce 0
@@ -159,7 +159,7 @@ Pip 加速设置请参考 <https://segmentfault.com/a/1190000011875306>
 ::
 
     $ cd /opt/jumpserver
-    $ python run_server.py all
+    $ ./jms start all  # 新版本更新了运行脚本,使用方式./jms start|stop|status|restart all
 
 运行不报错,请浏览器访问 http://192.168.244.144:8080/
 <<<<<<< HEAD
@@ -190,6 +190,7 @@ Pip 加速设置请参考 <https://segmentfault.com/a/1190000011875306>
 ::
 
     $ cd /opt
+    $ source /opt/py3/bin/activate
     $ git clone https://github.com/jumpserver/coco.git && cd coco && git checkout master
 
 
@@ -207,13 +208,13 @@ Pip 加速设置请参考 <https://segmentfault.com/a/1190000011875306>
 
     $ cd /opt/coco
     $ cp conf_example.py conf.py
-    $ python run_server.py
+    $ ./cocod start  # 新版本更新了运行脚本,使用方式./cocod start|stop|status|restart
 
 这时需要去 Jumpserver 管理后台-会话管理-终端管理(http://192.168.244.144:8080/terminal/terminal/)接受 Coco 的注册
 
 ::
 
-    Coco version 0.4.0, more see https://www.jumpserver.org
+    Coco version 1.0.0, more see https://www.jumpserver.org
     Starting ssh server at 0.0.0.0:2222
     Quit the server with CONTROL-C.
 
-- 
2.18.0