From e66b1b4192635b00456ae5bde984c5933f87f6e6 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 24 Dec 2014 22:20:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 connect.py                   | 2 +-
 jumpserver.conf => jump.conf | 0
 jumpserver/settings.py       | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename jumpserver.conf => jump.conf (100%)

diff --git a/connect.py b/connect.py
index ec26ad091..72e4c03a5 100755
--- a/connect.py
+++ b/connect.py
@@ -15,7 +15,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from Crypto.Cipher import AES
 from binascii import b2a_hex, a2b_hex
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'AutoSa.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
 django.setup()
 
 from juser.models import User, Group
diff --git a/jumpserver.conf b/jump.conf
similarity index 100%
rename from jumpserver.conf
rename to jump.conf
diff --git a/jumpserver/settings.py b/jumpserver/settings.py
index dd605974c..9a1e03248 100644
--- a/jumpserver/settings.py
+++ b/jumpserver/settings.py
@@ -15,7 +15,7 @@ import ConfigParser
 config = ConfigParser.ConfigParser()
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
-config.read(os.path.join(BASE_DIR, 'jumpserver.conf'))
+config.read(os.path.join(BASE_DIR, 'jump.conf'))
 
 DB_HOST = config.get('db', 'host')
 DB_PORT = config.getint('db', 'port')