update for new heroku db env methodology

sbronstein · Jun 2, 2012 · 507366b · 507366b
1 parent a877ab6
commit 507366b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.db
 *.pyc
-.DS_Store
+.DS_Store
+venv
diff --git a/klingsbo/__init__.pyc b/klingsbo/__init__.pyc
diff --git a/klingsbo/settings.py b/klingsbo/settings.py
@@ -30,17 +30,11 @@
       }
   }
 except:  
-  # example dev config with postgres
-  DATABASES = {
-      'default': {
-          'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-          'NAME': 'klingsbo',                      # Or path to database file if using sqlite3.
-          'USER': 'klingsbo',                      # Not used with sqlite3.
-          'PASSWORD': 'klingsbo',                  # Not used with sqlite3.
-          'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-          'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-      }
-  }
+
+  # the new Heroku way
+  import dj_database_url
+  DATABASES = {'default': dj_database_url.config(default='postgres://klingsbo:klingsbo@localhost/klingsbo')}
+
 
   # example dev config w sqlite
   #DATABASES = {

diff --git a/klingsbo/wsgi.pyc b/klingsbo/wsgi.pyc