Merge remote-tracking branch 'origin/OCMaster' into oc-main

repoint all docker configs to OC image environment
This commit is contained in:
Nick Craig
2023-05-03 09:45:18 -04:00
15 changed files with 247 additions and 14 deletions

View File

@@ -24,6 +24,20 @@ proxy_http_version 1.1;
{{ advanced_config }}
# Proxy!
{% if forward_proxy_header == 1 or forward_proxy_header == true %}
proxy_set_header Host $host;
{% else %}
proxy_set_header Host $proxy_host;
{% endif %}
include conf.d/include/proxy.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 %}
{{ locations }}
{% if use_default_location %}