aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWeitian LI <liweitianux@gmail.com>2014-06-23 20:54:00 +0800
committerWeitian LI <liweitianux@gmail.com>2014-06-23 20:54:00 +0800
commit232743f73148e0f2f5b32cb1e049643bb0f281d2 (patch)
tree8527720a593e42d206ad53106fbbd4232f6a4c03
parent03e349ebae1a1f2e4d2c4b9b72de924cb138581e (diff)
downloaddjango-skaschool-232743f73148e0f2f5b32cb1e049643bb0f281d2.tar.bz2
Split SECRET_KEY from settings and update .gitignore.
* Split 'SECRET_KEY' from settings * Updated settings files * Updated .gitignore settings
-rw-r--r--.gitignore7
-rw-r--r--db.sqlite3bin35840 -> 0 bytes
-rw-r--r--django_skaschool/settings.py2
-rw-r--r--django_skaschool/settings_mysql.py2
-rw-r--r--django_skaschool/settings_production.py2
5 files changed, 10 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index a7bf707..f7c8991 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,11 @@
#
django_skaschool/settings_email.py
+django_skaschool/secret_key.txt
+
+#
+db.sqlite3
+backup/
+static_root/
+media_root/
diff --git a/db.sqlite3 b/db.sqlite3
deleted file mode 100644
index 67c2663..0000000
--- a/db.sqlite3
+++ /dev/null
Binary files differ
diff --git a/django_skaschool/settings.py b/django_skaschool/settings.py
index 402815f..bdc5c38 100644
--- a/django_skaschool/settings.py
+++ b/django_skaschool/settings.py
@@ -18,7 +18,7 @@ PROJECT_DIR = os.path.dirname(__file__)
# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '3!73+$)!f&z@li7gg^^6w13&*vk#zbw*pue#9u+0l@_(5wocb@'
+SECRET_KEY = open(os.path.join(PROJECT_DIR, 'secret_key.txt')).read().strip()
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
diff --git a/django_skaschool/settings_mysql.py b/django_skaschool/settings_mysql.py
index 18c0196..4bd9f96 100644
--- a/django_skaschool/settings_mysql.py
+++ b/django_skaschool/settings_mysql.py
@@ -18,7 +18,7 @@ PROJECT_DIR = os.path.dirname(__file__)
# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '3!73+$)!f&z@li7gg^^6w13&*vk#zbw*pue#9u+0l@_(5wocb@'
+SECRET_KEY = open(os.path.join(PROJECT_DIR, 'secret_key.txt')).read().strip()
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
diff --git a/django_skaschool/settings_production.py b/django_skaschool/settings_production.py
index c447a8d..93b56c8 100644
--- a/django_skaschool/settings_production.py
+++ b/django_skaschool/settings_production.py
@@ -18,7 +18,7 @@ PROJECT_DIR = os.path.dirname(__file__)
# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '3!73+$)!f&z@li7gg^^6w13&*vk#zbw*pue#9u+0l@_(5wocb@'
+SECRET_KEY = open(os.path.join(PROJECT_DIR, 'secret_key.txt')).read().strip()
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False