From cba53bba553d1e0585421c2e9ae89c43883361aa Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 29 Feb 2016 10:25:59 +0800
Subject: [PATCH] =?UTF-8?q?modify(jumpserver.conf)=20=E4=BF=AE=E6=94=B9jum?=
 =?UTF-8?q?pserver.conf=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

django和tornado统一入口后，配置默认启动端口80
websocket和web都使用该端口
---
 jumpserver.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jumpserver.conf b/jumpserver.conf
index f1a166c09..a24203220 100644
--- a/jumpserver.conf
+++ b/jumpserver.conf
@@ -1,9 +1,9 @@
 [base]
 url = http://192.168.244.129
 websocket_url = ws://192.168.244.129
-key = 88aaaf7ffe3c6c04
-ip = 127.0.0.1
-port = 8080
+key = i6k2zeu8x6mncl76
+ip = 0.0.0.0
+port = 80
 log = debug
 
 [db]
@@ -15,9 +15,9 @@ database = jumpserver
 
 [mail]
 mail_enable = 1
-email_host = smtp.qq.com
+email_host = smtp.exmail.qq.com
 email_port = 25
-email_host_user = xxxxxxxx@qq.com
-email_host_password = xxxxxx
+email_host_user = noreply@jumpserver.org
+email_host_password = xxxxxxxxxx
 email_use_tls = True