From 7d412e4c180c0411d12c4239bd245606405cdbe5 Mon Sep 17 00:00:00 2001
From: root <root@192.168.10.148>
Date: Wed, 28 Oct 2015 22:30:34 +0800
Subject: [PATCH] update configure file

---
 jumpserver.conf        | 12 ++++--------
 jumpserver/settings.py |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/jumpserver.conf b/jumpserver.conf
index 94ee1653f..dd6d3fca7 100644
--- a/jumpserver.conf
+++ b/jumpserver.conf
@@ -1,19 +1,17 @@
 #coding: utf8
 
 [base]
-url = http://192.168.244.129
+url = http://192.168.10.148
 key = 88aaaf7ffe3c6c04
 log = debug
 
-
 [db]
-host = 127.0.0.1
+host = 192.168.10.148
 port = 3306
 user = jumpserver
-password = mysql234
+password =mysql1234
 database = jumpserver
 
-
 [ldap]
 ldap_enable = 1
 host_url = ldap://127.0.0.1:389
@@ -21,10 +19,8 @@ base_dn = dc=jumpserver, dc=org
 root_dn = cn=admin,dc=jumpserver,dc=org
 root_pw = secret234
 
-
 [websocket]
-web_socket_host = 192.168.40.140:3000
-
+web_socket_host = 192.168.10.148:3000
 
 [mail]
 mail_enable = 1
diff --git a/jumpserver/settings.py b/jumpserver/settings.py
index 0a5a69bee..db02336dc 100644
--- a/jumpserver/settings.py
+++ b/jumpserver/settings.py
@@ -62,7 +62,7 @@ INSTALLED_APPS = (
     'juser',
     'jasset',
     'jperm',
-    # 'jlog',
+     'jlog',
 )
 
 MIDDLEWARE_CLASSES = (