Permalink
Browse files

Merge pull request #11 from Brainsciences/master

updated django_settings.py to be compatible with newer versions of django
  • Loading branch information...
2 parents 0282892 + 06bc57b commit 57e783facbff63a1ef5c581fe2e4a899f97a0ad1 @rspeer rspeer committed Jun 12, 2012
Showing with 12 additions and 0 deletions.
  1. +12 −0 conceptnet/django_settings/__init__.py
@@ -75,6 +75,18 @@ def relative_to_db_config(path):
DATABASE_PORT = get_db_config('PORT', '') # Set to empty string for default. Not used with sqlite3.
DATABASE_OPTIONS = get_db_config('OPTIONS', {})
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.'+DATABASE_ENGINE,
+ 'NAME': DATABASE_NAME,
+ 'USER': DATABASE_USER,
+ 'PASSWORD': DATABASE_PASSWORD,
+ 'HOST': DATABASE_HOST,
+ 'PORT': DATABASE_PORT,
+ 'OPTIONS': DATABASE_OPTIONS
+ }
+}
+
# Local time zone for this installation. All choices can be found here:
# http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
TIME_ZONE = 'America/New_York'

0 comments on commit 57e783f

Please sign in to comment.