Skip to content
This repository has been archived by the owner on May 31, 2022. It is now read-only.

Commit

Permalink
local db file set
Browse files Browse the repository at this point in the history
  • Loading branch information
karambir committed Feb 13, 2013
1 parent 971fbcf commit 1051c7e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 1 addition & 3 deletions .gitignore
Expand Up @@ -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
2 changes: 0 additions & 2 deletions cdi/heroku_settings.py

This file was deleted.

6 changes: 5 additions & 1 deletion cdi/settings.py
Expand Up @@ -38,6 +38,7 @@
'student',
'college',
'event',
'gunicorn',
)

MEDIA_ROOT = ''
Expand Down Expand Up @@ -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

0 comments on commit 1051c7e

Please sign in to comment.