From f07b20aebdd8e9aa240a9d0f5a09cf62ff0c23f4 2017-06-24 05:59:46
From: Sachi King <nakato@nakato.io>
Date: 2017-06-24 05:59:46
Subject: [PATCH] DATABASE_URL as ENV_VAR

---

diff --git a/dev-env.sh b/dev-env.sh
index 676437600ad622af03f80ad2f5fb6345e2a2fdda..1e8d193660c36f15fcabb77fdbacbe56354fdc2a 100644
--- a/dev-env.sh
+++ b/dev-env.sh
@@ -3,3 +3,4 @@
 export DJANGO_SECRET_KEY=`uuidgen -r`
 export STRIPE_PUBLIC_KEY=`uuidgen -r`
 export STRIPE_SECRET_KEY=`uuidgen -r`
+export DATABASE_URL='sqlite:////tmp/symposion.sqlite'
diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 0668bb3d3bb947f9c5161f1a42fc83fd25431ae5..62fd7fc951581ea01484236b8192a261b07df766 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -2,6 +2,7 @@ import os
 import sys
 
 import django
+import dj_database_url
 import saml2
 import saml2.saml
 
@@ -27,12 +28,8 @@ else:
     sys.exit('DEBUG env var is in unexpected format.  Should be a string'
              'containing either a 0 or a 1 - Got type %s' % type(DEBUG))
 
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": os.path.join(PROJECT_ROOT, "dev.db"),
-    }
-}
+DATABASES['default'] = dj_database_url.config(conn_max_age=600)
+
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 THEME_CONTACT_EMAIL = os.environ.get('THEME_CONTACT_EMAIL', None)
 SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', None)
diff --git a/requirements.txt b/requirements.txt
index 712b929efd09982dd10b702ac4176b1abd1e68ab..94f4ff6560b8ae43a5b4343df3f9e23509e0d629 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,6 +7,7 @@ dj-database-url==0.4.0
 pylibmc==1.5.1
 django-debug-toolbar>=1.7
 django-bootstrap-form
+dj-database-url
 
 djangosaml2
 django-gapc-storage