Merge pull request #136 from jarifibrahim/heroku-dev-fix

tapaswenipathak · web-flow · commit 09fd5d108659 · 2017-10-15T23:31:26.000+05:30
settings.py: Add database settings for heroku
diff --git a/oshc/oshc/settings.py b/oshc/oshc/settings.py
@@ -10,6 +10,7 @@
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
+import dj_database_url
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
@@ -84,6 +85,11 @@
     }
 }
 
+# Get DATABASE_URL environment variable and update default DATABASE settings
+# This setting is required for Heroku
+db_from_env = dj_database_url.config()
+DATABASES['default'].update(db_from_env)
+
 # Internationalization
 # https://docs.djangoproject.com/en/1.7/topics/i18n/
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`
`11`	`11`	`# Build paths inside the project like this: os.path.join(BASE_DIR, ...)`
`12`	`12`	`import os`
	`13`	`+import dj_database_url`
`13`	`14`
`14`	`15`	`BASE_DIR = os.path.dirname(os.path.dirname(__file__))`
`15`	`16`
`@@ -84,6 +85,11 @@`
`84`	`85`	`}`
`85`	`86`	`}`
`86`	`87`
	`88`	`+# Get DATABASE_URL environment variable and update default DATABASE settings`
	`89`	`+# This setting is required for Heroku`
	`90`	`+db_from_env = dj_database_url.config()`
	`91`	`+DATABASES['default'].update(db_from_env)`
	`92`	`+`
`87`	`93`	`# Internationalization`
`88`	`94`	`# https://docs.djangoproject.com/en/1.7/topics/i18n/`
`89`	`95`