Move 'Allow Websockets' definitions to host root configuration

This fixes issues with these settings not applying to custom locations
defined under hosts.
This commit is contained in:
Daniel Porter 2021-04-13 20:04:35 +01:00
parent f056b9dc7f
commit 421934efed

View File

@ -13,6 +13,13 @@ server {
{% include "_hsts.conf" %}
{% include "_forced_ssl.conf" %}
{% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $http_connection;
proxy_http_version 1.1;
{% endif %}
access_log /data/logs/proxy_host-{{ id }}.log proxy;
{{ advanced_config }}
@ -46,12 +53,6 @@ server {
{% include "_hsts.conf" %}
{% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $http_connection;
proxy_http_version 1.1;
{% endif %}
# Proxy!
include conf.d/include/proxy.conf;
}