From 41f249ed5a499b00b48e2c92764fe7d28d28c351 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Sun, 2 Jul 2023 11:00:47 +0200
Subject: [PATCH 1/2] 0.4.1

---
 CHANGELOG.md       |  4 ++++
 docker-compose.yml | 31 ++++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 086c8c6..9e8b5f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.1
+
+- Add missing env variables
+
 ## 0.4.0
 
 - Add Makefile & use `pip-tools` to generate dependencies
diff --git a/docker-compose.yml b/docker-compose.yml
index 0e618a2..e81abb0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,11 +13,36 @@ x-db-env: &db-env
   POSTGRES_USER:
   POSTGRES_PASSWORD:
 
-x-django-env: &django-env
+x-django-build-env: &django-build-env
   <<: *db-env
   DJANGO_SECRET_KEY:
   DJANGO_SETTINGS_MODULE:
 
+x-django-env: &django-env
+  <<: *django-build-env
+
+  # Email
+  EMAIL_HOST:
+  EMAIL_PORT:
+  EMAIL_HOST_USER:
+  EMAIL_HOST_PASSWORD:
+  EMAIL_USE_TLS:
+  EMAIL_USE_SSL:
+  EMAIL_DEFAULT_FROM:
+
+  # Reddit
+  REDDIT_CLIENT_ID:
+  REDDIT_CLIENT_SECRET:
+  REDDIT_CALLBACK_URL:
+
+  # Twitter
+  TWITTER_CONSUMER_ID:
+  TWITTER_CONSUMER_SECRET:
+  TWITTER_REDIRECT_URL:
+
+  # Sentry
+  SENTRY_DSN:
+
 services:
   db:
     environment:
@@ -47,7 +72,7 @@ services:
       dockerfile: ./docker/django
       target: production
       args:
-        <<: *django-env
+        <<: *django-build-env
     environment:
       <<: *django-env
     command: |
@@ -77,7 +102,7 @@ services:
       dockerfile: ./docker/django
       target: production
       args:
-        <<: *django-env
+        <<: *django-build-env
     environment:
         <<: *django-env
     entrypoint: /app/bin/docker-entrypoint.sh

From f0689ebfab21c57148ac30de319d98e6364033aa Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Sun, 2 Jul 2023 12:55:19 +0200
Subject: [PATCH 2/2] 0.4.2

---
 CHANGELOG.md                      | 4 ++++
 package.json                      | 2 +-
 pyproject.toml                    | 2 +-
 src/newsreader/conf/production.py | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e8b5f8..2f8afa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.2
+
+- Set `SECURE_PROXY_SSL_HEADER` setting for production
+
 ## 0.4.1
 
 - Add missing env variables
diff --git a/package.json b/package.json
index 0a4ba4b..76638ee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "newsreader",
-  "version": "0.3.13.8",
+  "version": "0.4.2",
   "description": "Application for viewing RSS feeds",
   "main": "index.js",
   "scripts": {
diff --git a/pyproject.toml b/pyproject.toml
index bad9050..b8188a9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = 'newsreader'
-version = '0.4.0.0'
+version = '0.4.2'
 authors = [{name = 'Sonny', email= 'sonnyba871@gmail.com'}]
 license = {text = 'GPL-3.0'}
 requires-python = '>=3.11'
diff --git a/src/newsreader/conf/production.py b/src/newsreader/conf/production.py
index cef9c4a..4edc9f0 100644
--- a/src/newsreader/conf/production.py
+++ b/src/newsreader/conf/production.py
@@ -7,7 +7,10 @@ from .base import *  # isort:skip
 
 DEBUG = False
 
+SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
+
 ALLOWED_HOSTS = ["127.0.0.1", "localhost", "rss.fudiggity.nl", "django"]
+
 ADMINS = [
     ("", email)
     for email in os.getenv("ADMINS", "").split(",")