haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-09 10:50:24 +00:00
Code Issues Releases Wiki Activity

Fix settings loading bug

Browse Source
This commit is contained in:
xiez
2012-07-06 16:54:49 +08:00
parent 3340d139d4
commit 567dcc0e76
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
settings.py
View File

@@ -212,6 +212,13 @@ SEAHUB_TITLE = 'SeaHub'
USE_SUBDOMAIN = False USE_SUBDOMAIN = False
ACCOUNT_TYPE = 'personal' ACCOUNT_TYPE = 'personal'
try:
from local_settings import SECRET_KEY
except ImportError:
SETTINGS_DIR = os.path.abspath(os.path.dirname(__file__))
from secret_key_generator import generate_secret_key
generate_secret_key(os.path.join(SETTINGS_DIR, 'local_settings.py'))
try: try:
import local_settings import local_settings
except ImportError: except ImportError:
@@ -235,11 +242,3 @@ else:
LOGIN_URL = SITE_ROOT + 'accounts/login' LOGIN_URL = SITE_ROOT + 'accounts/login'
SEAFILE_VERSION = '0.9.4' SEAFILE_VERSION = '0.9.4'
try:
from local_settings import SECRET_KEY
except ImportError:
SETTINGS_DIR = os.path.abspath(os.path.dirname(__file__))
from secret_key_generator import generate_secret_key
generate_secret_key(os.path.join(SETTINGS_DIR, 'local_settings.py'))
from local_settings import SECRET_KEY