diff --git a/NightShade/settings.py b/NightShade/settings.py index d51b157..a8a7b14 100644 --- a/NightShade/settings.py +++ b/NightShade/settings.py @@ -1,4 +1,5 @@ import os +import dj_database_url # Django settings for NightShade project. @@ -14,25 +15,21 @@ MANAGERS = ADMINS DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'MyDatebase', # Or path to database file if using sqlite3. - # The following settings are not used with sqlite3: - 'USER': '', - 'PASSWORD': '', - 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. - 'PORT': '', # Set to empty string for default. - } - } - -DATABASES['default'] = dj_database_url.config() + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': 'mydatabase' + } + } + + +DATABASES['default'] = dj_database_url.config() + +SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PRONTO', 'https') # Hosts/domain names that are valid for this site; required if DEBUG is False # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts ALLOWED_HOSTS = ['*'] -SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') - # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. @@ -163,4 +160,3 @@ }, } } - diff --git a/NightShade/settings.pyc b/NightShade/settings.pyc index eec1752..03cd8a9 100644 Binary files a/NightShade/settings.pyc and b/NightShade/settings.pyc differ