From 163826b4bf061c2d03cab6cc6027e78e710db407 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Perrin?= Date: Fri, 11 Nov 2016 18:40:27 +0000 Subject: [PATCH] Separate settings between deployment and production --- djsite/settings.py | 114 +------------------------------------- djsite/settings_common.py | 102 ++++++++++++++++++++++++++++++++++ djsite/settings_dev.py | 22 ++++++++ djsite/settings_prod.py | 46 +++++++++++++++ djsite/wsgi.py | 2 +- 5 files changed, 174 insertions(+), 112 deletions(-) create mode 100644 djsite/settings_common.py create mode 100644 djsite/settings_dev.py create mode 100644 djsite/settings_prod.py diff --git a/djsite/settings.py b/djsite/settings.py index de13f1a..0950bba 100644 --- a/djsite/settings.py +++ b/djsite/settings.py @@ -1,112 +1,4 @@ -""" -Django settings for djsite project. +# import everything from settings-dev by default; in wsgi.py use the settings +# defined in settings-prod instead -Generated by 'django-admin startproject' using Django 1.8.7. - -For more information on this file, see -https://docs.djangoproject.com/en/1.8/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.8/ref/settings/ -""" - -# Build paths inside the project like this: os.path.join(BASE_DIR, ...) -import os - -BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 's665xl1i*aa@k@-!3xnga&qf47^hl*g9z7z7r51e_3*5vqi7=m' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] - - -# Application definition - -INSTALLED_APPS = ( - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'jquery', - 'tinymce', - 'quotes', -) - -MIDDLEWARE_CLASSES = ( - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django.middleware.security.SecurityMiddleware', -) - -ROOT_URLCONF = 'djsite.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', - ], - }, - }, -] - -WSGI_APPLICATION = 'djsite.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/1.8/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } -} - - -# Internationalization -# https://docs.djangoproject.com/en/1.8/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'Europe/London' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.8/howto/static-files/ - -STATIC_URL = '/static/' - -TINYMCE_DEFAULT_CONFIG = { -# 'theme_advanced_buttons1' : ['bold', 'underline', 'italic', 'separator', 'insertdate', 'inserttime'], - 'theme_advanced_buttons1' : 'undo,redo,cut,copy,paste,|,bold,italic,removeformat,|,bullist,numlist,|,link,unlink', - 'theme_advanced_buttons2' : '', - 'theme_advanced_buttons3' : "", - 'plugins': 'table', -} +from djsite.settings_dev import * diff --git a/djsite/settings_common.py b/djsite/settings_common.py new file mode 100644 index 0000000..101d833 --- /dev/null +++ b/djsite/settings_common.py @@ -0,0 +1,102 @@ +""" +Django settings for djsite project. + +Generated by 'django-admin startproject' using Django 1.8.7. + +For more information on this file, see +https://docs.djangoproject.com/en/1.8/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.8/ref/settings/ +""" + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +import os + +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ + +# SECRET_KEY overridden in settings-{dev,prod}.py + +# DEBUG overridden in settings-{dev,prod}.py + +# ALLOWED_HOSTS overridden in settings-{dev,prod}.py + +# Application definition + +INSTALLED_APPS = ( + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'jquery', + 'tinymce', + 'quotes', +) + +MIDDLEWARE_CLASSES = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.security.SecurityMiddleware', +) + +ROOT_URLCONF = 'djsite.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'djsite.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.8/ref/settings/#databases + +# DATABASES overridden in settings-{dev,prod}.py + +# Internationalization +# https://docs.djangoproject.com/en/1.8/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'Europe/London' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.8/howto/static-files/ +# STATIC_URL overridden in settings-{dev,prod}.py + +TINYMCE_DEFAULT_CONFIG = { +# 'theme_advanced_buttons1' : ['bold', 'underline', 'italic', 'separator', 'insertdate', 'inserttime'], + 'theme_advanced_buttons1' : 'undo,redo,cut,copy,paste,|,bold,italic,removeformat,|,bullist,numlist,|,link,unlink', + 'theme_advanced_buttons2' : '', + 'theme_advanced_buttons3' : "", + 'plugins': 'table', +} diff --git a/djsite/settings_dev.py b/djsite/settings_dev.py new file mode 100644 index 0000000..56c0a16 --- /dev/null +++ b/djsite/settings_dev.py @@ -0,0 +1,22 @@ +from djsite.settings_common import * + +SECRET_KEY = 's665xl1i*aa@k@-!3xnga&qf47^hl*g9z7z7r51e_3*5vqi7=m' + +DEBUG = True + +ALLOWED_HOSTS = [] + +# Database +# https://docs.djangoproject.com/en/1.8/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.8/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/djsite/settings_prod.py b/djsite/settings_prod.py new file mode 100644 index 0000000..968f2d6 --- /dev/null +++ b/djsite/settings_prod.py @@ -0,0 +1,46 @@ +import os +from djsite.settings_common import * + +with open(os.path.join(BASE_DIR, "..", "secret_key")) as f: + SECRET_KEY = f.readline().strip() + +DEBUG = False + +ALLOWED_HOSTS = ['quotes.fperrin.net'] + +# Database +# https://docs.djangoproject.com/en/1.8/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'djsite', + 'USER': 'djsite', + 'HOST': 'www.priv.fperrin.net', + } +} + +with open(os.path.join(BASE_DIR, "..", "pg_secret")) as f: + DATABASES['default']['PASSWORD'] = f.readline().strip() + +STATIC_ROOT = os.path.normpath(os.path.join(BASE_DIR, "..", "static")) +STATIC_URL = "https://quotes.fperrin.net/static/" + +### HTTPS-related settings from https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ + +CSRF_COOKIE_SECURE = True +CSRF_COOKIE_HTTPONLY = True +SESSION_COOKIE_SECURE = True +SESSION_COOKIE_HTTPONLY = True + +SECURE_HSTS_SECONDS = 60 +SECURE_SSL_REDIRECT = True + +SECURE_CONTENT_TYPE_NOSNIFF = True +SECURE_BROWSER_XSS_FILTER = True + +X_FRAME_OPTIONS = 'DENY' + +SILENCED_SYSTEM_CHECKS = [ + 'security.W005', # SECURE_HSTS_INCLUDE_SUBDOMAINS, not applicable +] diff --git a/djsite/wsgi.py b/djsite/wsgi.py index 395516e..3da59ad 100644 --- a/djsite/wsgi.py +++ b/djsite/wsgi.py @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djsite.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "djsite.settings_prod" application = get_wsgi_application() -- 2.43.0