Merge branch 'master' of benjaoming/membersystem into master

This commit is contained in:
decibyte 2018-06-23 14:04:24 +00:00 committed by Gitea
commit b10ecac1f4
3 changed files with 11 additions and 3 deletions

1
.gitignore vendored
View file

@ -2,3 +2,4 @@ __pycache__/
*.pyc *.pyc
*.sw* *.sw*
db.sqlite3 db.sqlite3
membersystem/settings/local.py

View file

@ -0,0 +1,10 @@
import warnings
from .base import *
try:
from .local import *
except ImportError:
warnings.warn("No settings.local, using a default SECRET_KEY 'hest'")
SECRET_KEY = "hest"
pass

View file

@ -19,9 +19,6 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Quick-start development settings - unsuitable for production # Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/ # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = '=z5+m4xt$)a#l-*d50vta1vnnho250h3up9o+$c@)ztf8ahw3q'
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True