Skip to content

Commit

Permalink
quickly
Browse files Browse the repository at this point in the history
  • Loading branch information
akama committed Sep 5, 2013
1 parent 6bc8494 commit a2efd02
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 15 deletions.
26 changes: 11 additions & 15 deletions NightShade/settings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import dj_database_url

# Django settings for NightShade project.

Expand All @@ -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.
Expand Down Expand Up @@ -163,4 +160,3 @@
},
}
}

Binary file modified NightShade/settings.pyc
Binary file not shown.

0 comments on commit a2efd02

Please sign in to comment.