Skip to content
Permalink
Browse files

docs(api): update doc pointers for Django 1.11

  • Loading branch information...
mboersma committed Apr 4, 2017
1 parent 1f93f21 commit 32cd7379f711b1f7a09f9b7480de500573769e48
Showing with 12 additions and 11 deletions.
  1. +2 −1 rootfs/api/middleware.py
  2. +7 −7 rootfs/api/settings/production.py
  3. +2 −2 rootfs/api/settings/testing.py
  4. +1 −1 rootfs/api/wsgi.py
@@ -1,7 +1,7 @@
"""
HTTP middleware for the Deis REST API.
See https://docs.djangoproject.com/en/1.10/topics/http/middleware/
See https://docs.djangoproject.com/en/1.11/topics/http/middleware/
"""

from api import __version__
@@ -11,6 +11,7 @@ class APIVersionMiddleware(object):
"""
Include that REST API version with each response.
"""

def __init__(self, get_response):
self.get_response = get_response

@@ -9,16 +9,16 @@
from django_auth_ldap.config import LDAPSearch, GroupOfNamesType

# A boolean that turns on/off debug mode.
# https://docs.djangoproject.com/en/1.9/ref/settings/#debug
# https://docs.djangoproject.com/en/1.11/ref/settings/#debug
DEBUG = bool(os.environ.get('DEIS_DEBUG', False))

# If set to True, Django's normal exception handling of view functions
# will be suppressed, and exceptions will propagate upwards
# https://docs.djangoproject.com/en/1.9/ref/settings/#debug-propagate-exceptions
# https://docs.djangoproject.com/en/1.11/ref/settings/#debug-propagate-exceptions
DEBUG_PROPAGATE_EXCEPTIONS = False

# Silence two security messages around SSL as router takes care of them
# https://docs.djangoproject.com/en/1.9/ref/checks/#security
# https://docs.djangoproject.com/en/1.11/ref/checks/#security
SILENCED_SYSTEM_CHECKS = [
'security.W004',
'security.W008'
@@ -27,7 +27,7 @@
CONN_MAX_AGE = 60 * 3

# SECURITY: change this to allowed fqdn's to prevent host poisioning attacks
# https://docs.djangoproject.com/en/1.6/ref/settings/#allowed-hosts
# https://docs.djangoproject.com/en/1.11/ref/settings/#allowed-hosts
ALLOWED_HOSTS = ['*']

# Local time zone for this installation. Choices can be found here:
@@ -42,7 +42,7 @@

# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
# https://docs.djangoproject.com/en/1.9/ref/settings/#use-i18n
# https://docs.djangoproject.com/en/1.11/ref/settings/#use-i18n
USE_I18N = False

# If you set this to False, Django will not format dates, numbers and
@@ -140,7 +140,7 @@
SECURE_BROWSER_XSS_FILTER = True

# Honor HTTPS from a trusted proxy
# see https://docs.djangoproject.com/en/1.6/ref/settings/#secure-proxy-ssl-header
# see https://docs.djangoproject.com/en/1.11/ref/settings/#secure-proxy-ssl-header
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')

# standard datetime format used for logging, model timestamps, etc.
@@ -353,7 +353,7 @@
'PASSWORD': os.environ.get('DEIS_DATABASE_PASSWORD', ''),
'HOST': os.environ.get('DEIS_DATABASE_SERVICE_HOST', ''),
'PORT': os.environ.get('DEIS_DATABASE_SERVICE_PORT', 5432),
# https://docs.djangoproject.com/en/1.9/ref/databases/#persistent-connections
# https://docs.djangoproject.com/en/1.11/ref/databases/#persistent-connections
'CONN_MAX_AGE': 600,
}
}
@@ -6,12 +6,12 @@
from api.settings.production import * # noqa

# A boolean that turns on/off debug mode.
# https://docs.djangoproject.com/en/1.9/ref/settings/#debug
# https://docs.djangoproject.com/en/1.11/ref/settings/#debug
DEBUG = True

# If set to True, Django's normal exception handling of view functions
# will be suppressed, and exceptions will propagate upwards
# https://docs.djangoproject.com/en/1.9/ref/settings/#debug-propagate-exceptions
# https://docs.djangoproject.com/en/1.11/ref/settings/#debug-propagate-exceptions
DEBUG_PROPAGATE_EXCEPTIONS = True

# scheduler for testing
@@ -4,7 +4,7 @@
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/
https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
"""

import os

0 comments on commit 32cd737

Please sign in to comment.
You can’t perform that action at this time.