From 66ea9aedd14506b35df0f4c3ab287ba196819acc Mon Sep 17 00:00:00 2001
From: Jeremiah Orem <jeremy.orem@gmail.com>
Date: Fri, 21 Dec 2012 11:12:05 -0800
Subject: [PATCH] Use dj-database-url for database settings.

---
 requirements.txt      |  1 +
 sites/dev/settings.py | 26 +++++++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c9802ee..929b667 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
 #celery==2.5.1
 #celery-tasktree==0.3.2
 #django-celery==2.2.4
+dj-database-url==0.2.1
 django-extensions==0.9
 django-multidb-router==0.5
 django-nose==1.1
diff --git a/sites/dev/settings.py b/sites/dev/settings.py
index bb52f81..dae5bca 100644
--- a/sites/dev/settings.py
+++ b/sites/dev/settings.py
@@ -1,23 +1,19 @@
+import dj_database_url
+
 import private
 from gelato.admin.settings import *
 
-HOSTNAME='marketplace-admin-dev.allizom.org'
-DOMAIN=HOSTNAME
+HOSTNAME = 'marketplace-admin-dev.allizom.org'
+DOMAIN = HOSTNAME
 SITE_URL = 'http://%s' % DOMAIN
 STATIC_URL = SITE_URL
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'mysql_pymysql',
-        'NAME': private.DATABASES_DEFAULT_NAME,
-        'HOST': private.DATABASES_DEFAULT_HOST,
-        'PORT': private.DATABASES_DEFAULT_PORT,
-        'USER': private.DATABASES_DEFAULT_USER,
-        'PASSWORD': private.DATABASES_DEFAULT_PASSWORD,
-        'OPTIONS': {'init_command': 'SET storage_engine=InnoDB'},
-        'TEST_CHARSET': 'utf8',
-        'TEST_COLLATION': 'utf8_general_ci',
-    },
-}
+DATABASES = {'default': dj_database_url.parse(private.DATABASES_DEFAULT_URL)}
+DATABASES.update({
+    'ENGINE': 'mysql_pymysql',
+    'OPTIONS': {'init_command': 'SET storage_engine=InnoDB'},
+    'TEST_CHARSET': 'utf8',
+    'TEST_COLLATION': 'utf8_general_ci',
+})
 
 SESSION_COOKIE_DOMAIN = ".%s" % HOSTNAME