From fec5bd1345218802dfef297aedf9a629f4beba64 Mon Sep 17 00:00:00 2001 From: Frank Wiles Date: Mon, 16 Jan 2023 15:07:52 -0600 Subject: [PATCH] Assume https URLs --- config/settings.py | 6 ++++++ docker-compose.yml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/config/settings.py b/config/settings.py index e94ad46f..a0ce03ed 100755 --- a/config/settings.py +++ b/config/settings.py @@ -20,6 +20,9 @@ if READ_DOT_ENV_FILE: # SECURITY WARNING: don't run with debug turned on in production! DEBUG = env.bool("DJANGO_DEBUG", default=False) +# Whether or not we're in local development mode +LOCAL_DEVELOPMENT = env.bool("LOCAL_DEVELOPMENT", default=False) + if DEBUG: root = logging.getLogger() root.setLevel(logging.INFO) @@ -295,6 +298,9 @@ SECURE_PROXY_SSL_HEADER_NAME = env("SECURE_PROXY_SSL_HEADER_NAME", default=None) SECURE_PROXY_SSL_HEADER_VALUE = env("SECURE_PROXY_SSL_HEADER_VALUE", default=None) SECURE_SSL_REDIRECT = env("SECURE_SSL_REDIRECT", default=False) +if not LOCAL_DEVELOPMENT: + ACCOUNT_DEFAULT_HTTP_PROTOCOL = "https" + if all( [SECURE_PROXY_SSL_HEADER_NAME, SECURE_PROXY_SSL_HEADER_VALUE, SECURE_SSL_REDIRECT] ): diff --git a/docker-compose.yml b/docker-compose.yml index 435a9f56..0142042b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,8 @@ services: command: [ "/bin/bash", "/code/compose-start.sh" ] depends_on: - db + environment: + - "LOCAL_DEVELOPMENT=true" env_file: - .env init: true