diff --git a/oshc/oshc/settings.py b/oshc/oshc/settings.py index 982ca99..5380ad6 100644 --- a/oshc/oshc/settings.py +++ b/oshc/oshc/settings.py @@ -11,6 +11,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__)) # Quick-start development settings - unsuitable for production @@ -22,8 +23,6 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = os.getenv("DEBUG", False) -SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') - ALLOWED_HOSTS = ['*'] # Tuple of people who get error notifications @@ -76,7 +75,15 @@ }, ] -DATABASES = { 'default': dj_database_url.config() } +# Database +# https://docs.djangoproject.com/en/1.7/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} # Get DATABASE_URL environment variable and update default DATABASE settings # This setting is required for Heroku @@ -111,8 +118,3 @@ STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'main/'), ) - -try: - from local_settings import * -except ImportError: - pass