From 1051c7e95847be671a4a647ecd3cd81c702a81a5 Mon Sep 17 00:00:00 2001 From: Karambir Singh Nain Date: Wed, 13 Feb 2013 17:05:47 +0530 Subject: [PATCH] local db file set --- .gitignore | 4 +--- cdi/heroku_settings.py | 2 -- cdi/settings.py | 6 +++++- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 cdi/heroku_settings.py diff --git a/.gitignore b/.gitignore index 8ccf43c..199cee8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,4 @@ *.swp *.db *.png -cdi/local_settings.py -cdi/static/img/google-login3.png -cdi/static/img/google-login2.png +cdi/local_db_settings.py diff --git a/cdi/heroku_settings.py b/cdi/heroku_settings.py deleted file mode 100644 index 2fdf3b1..0000000 --- a/cdi/heroku_settings.py +++ /dev/null @@ -1,2 +0,0 @@ -import dj_database_url -DATABASES['default'] = dj_database_url.config() diff --git a/cdi/settings.py b/cdi/settings.py index cb0380b..aebc209 100644 --- a/cdi/settings.py +++ b/cdi/settings.py @@ -38,6 +38,7 @@ 'student', 'college', 'event', + 'gunicorn', ) MEDIA_ROOT = '' @@ -134,12 +135,15 @@ } } +import dj_database_url +DATABASES['default'] = dj_database_url.config() + try: from local_settings import * except ImportError: pass try: - from heroku_settings import * + from local_db_settings import * except ImportError: pass