From f056b9dc7f94118b5d6ccb54661f466c2a0e3566 Mon Sep 17 00:00:00 2001
From: Daniel Porter <dpreid@gmail.com>
Date: Tue, 13 Apr 2021 19:59:49 +0100
Subject: [PATCH] Move 'Force SSL' definitions to host root configuration

This fixes issues with these settings not applying to custom locations
defined under hosts.
---
 backend/templates/dead_host.conf        | 2 +-
 backend/templates/proxy_host.conf       | 2 +-
 backend/templates/redirection_host.conf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/templates/dead_host.conf b/backend/templates/dead_host.conf
index da282a12..be53f6df 100644
--- a/backend/templates/dead_host.conf
+++ b/backend/templates/dead_host.conf
@@ -5,6 +5,7 @@ server {
 {% include "_listen.conf" %}
 {% include "_certificates.conf" %}
 {% include "_hsts.conf" %}
+{% include "_forced_ssl.conf" %}
 
   access_log /data/logs/dead_host-{{ id }}.log standard;
 
@@ -12,7 +13,6 @@ server {
 
 {% if use_default_location %}
   location / {
-{% include "_forced_ssl.conf" %}
 {% include "_hsts.conf" %}
     return 404;
   }
diff --git a/backend/templates/proxy_host.conf b/backend/templates/proxy_host.conf
index 17a52107..738cdcb7 100644
--- a/backend/templates/proxy_host.conf
+++ b/backend/templates/proxy_host.conf
@@ -11,6 +11,7 @@ server {
 {% include "_assets.conf" %}
 {% include "_exploits.conf" %}
 {% include "_hsts.conf" %}
+{% include "_forced_ssl.conf" %}
 
   access_log /data/logs/proxy_host-{{ id }}.log proxy;
 
@@ -43,7 +44,6 @@ server {
 
     {% endif %}
 
-{% include "_forced_ssl.conf" %}
 {% include "_hsts.conf" %}
 
     {% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
diff --git a/backend/templates/redirection_host.conf b/backend/templates/redirection_host.conf
index 55e7280f..f42e146b 100644
--- a/backend/templates/redirection_host.conf
+++ b/backend/templates/redirection_host.conf
@@ -7,6 +7,7 @@ server {
 {% include "_assets.conf" %}
 {% include "_exploits.conf" %}
 {% include "_hsts.conf" %}
+{% include "_forced_ssl.conf" %}
 
   access_log /data/logs/redirection_host-{{ id }}.log standard;
 
@@ -14,7 +15,6 @@ server {
 
 {% if use_default_location %}
   location / {
-{% include "_forced_ssl.conf" %}
 {% include "_hsts.conf" %}
 
     {% if preserve_path == 1 or preserve_path == true %}