PapaTutuWawa/etesync-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge: improve support for having local setting overrides

Browse Source 
This is a merge of PR #9
This commit is contained in:
Tom Hacohen 2018-10-30 15:25:47 +00:00 committed by GitHub
commit de70c40a18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etesync_server/settings.py
View File

@ -23,7 +23,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# SECURITY WARNING: keep the secret key used in production secret! # SECURITY WARNING: keep the secret key used in production secret!
# See secret.py for how this is generated; uses a file 'secret.txt' in the root # See secret.py for how this is generated; uses a file 'secret.txt' in the root
# directory # directory
SECRET_KEY = get_secret_from_file(os.path.join(BASE_DIR, "secret.txt")) SECRET_FILE = os.path.join(BASE_DIR, "secret.txt")
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False DEBUG = False
@ -135,3 +135,12 @@ JOURNAL_API_PERMISSIONS = (
# Cors # Cors
CORS_ORIGIN_ALLOW_ALL = True CORS_ORIGIN_ALLOW_ALL = True
# Make an `etesync_site_settings` module available to override settings.
try:
from etesync_site_settings import *
except ImportError:
pass
if 'SECRET_KEY' not in locals():
SECRET_KEY = get_secret_from_file(SECRET_FILE)