Skip to content

Predev merge #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2017
Merged

Predev merge #138

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac5d426
trigger build test
tapaswenipathak Oct 16, 2017
82daaa6
Fix travis failure, update settings.DATABASES
tapaswenipathak Oct 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions oshc/oshc/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -111,8 +118,3 @@
STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'main/'),
)

try:
from local_settings import *
except ImportError:
pass