Skip to content

Commit bdebb4a

Browse files
Fix travis failure, update settings.DATABASES
1 parent 9dc58dd commit bdebb4a

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

Diff for: oshc/oshc/settings.py

+10-8
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
1212
import os
1313
import dj_database_url
14+
1415
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
1516

1617
# Quick-start development settings - unsuitable for production
@@ -22,8 +23,6 @@
2223
# SECURITY WARNING: don't run with debug turned on in production!
2324
DEBUG = os.getenv("DEBUG", False)
2425

25-
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
26-
2726
ALLOWED_HOSTS = ['*']
2827

2928
# Tuple of people who get error notifications
@@ -76,7 +75,15 @@
7675
},
7776
]
7877

79-
DATABASES = { 'default': dj_database_url.config() }
78+
# Database
79+
# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
80+
81+
DATABASES = {
82+
'default': {
83+
'ENGINE': 'django.db.backends.sqlite3',
84+
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
85+
}
86+
}
8087

8188
# Get DATABASE_URL environment variable and update default DATABASE settings
8289
# This setting is required for Heroku
@@ -111,8 +118,3 @@
111118
STATICFILES_DIRS = (
112119
os.path.join(BASE_DIR, 'main/'),
113120
)
114-
115-
try:
116-
from local_settings import *
117-
except ImportError:
118-
pass

0 commit comments

Comments
 (0)