From 725405e4fd5dd7983f82bb3a6a8079e71f2aa597 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Sun, 28 Feb 2016 16:41:44 +0800
Subject: [PATCH] =?UTF-8?q?change(install)=20=E4=BF=AE=E6=94=B9=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E6=9B=B4=E6=94=B9=E5=8F=98=E5=8C=96=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=20run=5Fserver.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

websocket -> websocket_url
---
 install/install.py | 4 ++--
 install/next.py    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/install.py b/install/install.py
index 007c1050..d7c25660 100755
--- a/install/install.py
+++ b/install/install.py
@@ -97,13 +97,13 @@ class PreSetup(object):
         conf = ConfigParser.ConfigParser()
         conf.read(conf_file)
         conf.set('base', 'url', 'http://%s' % self.ip)
+        conf.set('base', 'websocket_url', 'ws://%s' % self.ip)
         conf.set('base', 'key', self.key)
         conf.set('db', 'host', self.db_host)
         conf.set('db', 'port', self.db_port)
         conf.set('db', 'user', self.db_user)
         conf.set('db', 'password', self.db_pass)
         conf.set('db', 'database', self.db)
-        conf.set('websocket', 'web_socket_host', '%s:3000' % self.ip)
         conf.set('mail', 'email_host', self.mail_host)
         conf.set('mail', 'email_port', self.mail_port)
         conf.set('mail', 'email_host_user', self.mail_addr)
@@ -237,7 +237,7 @@ class PreSetup(object):
             print
 
     def start(self):
-        color_print('请务必先查看wiki https://github.com/ibuler/jumpserver/wiki/Quickinstall')
+        color_print('请务必先查看wiki https://github.com/jumpserver/jumpserver/wiki')
         time.sleep(3)
         self._rpm_repo()
         self._depend_rpm()
diff --git a/install/next.py b/install/next.py
index 49d62db2..e11d4151 100755
--- a/install/next.py
+++ b/install/next.py
@@ -86,7 +86,7 @@ class Setup(object):
         os.chmod('init.sh', 0755)
         os.chmod('connect.py', 0755)
         os.chmod('manage.py', 0755)
-        os.chmod('run_websocket.py', 0755)
+        os.chmod('run_server.py', 0755)
         os.chmod('service.sh', 0755)
         os.chmod('logs', 0777)
         os.chmod('keys', 0777)
@@ -95,7 +95,7 @@ class Setup(object):
     def _run_service():
         os.system('sh %s start' % os.path.join(jms_dir, 'service.sh'))
         print
-        color_print('安装成功，请访问web, 祝你使用愉快。\n请访问 https://github.com/jumpserver/jumpserver 查看文档', 'green')
+        color_print('安装成功，请访问web, 祝你使用愉快。\n请访问 https://github.com/jumpserver/jumpserver/wiki 查看文档', 'green')
 
     def start(self):
         print "开始安装Jumpserver, 要求环境为 CentOS 6.5 x86_64"
-- 
2.18.0