Compare commits

..

No commits in common. "1cdc458c59e020759a4db3abd2bff9ae1c43cccb" and "9a2a21603242b6c538bca9d7213cc63de42cc38f" have entirely different histories.

3 changed files with 0 additions and 19 deletions

View file

@ -4,11 +4,6 @@ nginx:
https: https:
port: 8096 port: 8096
prot: http prot: http
proxy_headers:
X-Forwarded-Protocol: $scheme
Upgrade: $http_upgrade
Connection: upgrade
portal: portal:
Media: Media:

View file

@ -39,11 +39,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Ssl on; proxy_set_header X-Forwarded-Ssl on;
{%- if pillar['nginx'][server]['proxy_headers'] is defined -%}
{%- for header in pillar['nginx'][server]['proxy_headers'] %}
proxy_set_header {{header}} {{pillar['nginx'][server]['proxy_headers'][header]}};
{%- endfor %}
{%- endif %}
# re-write redirects to http as to https, example: /home # re-write redirects to http as to https, example: /home
proxy_redirect http:// https://; proxy_redirect http:// https://;

View file

@ -38,17 +38,8 @@ server {
{% set location="2" %}{% include 'roles/maintain/nginx-proxy/auth.conf' %} {% set location="2" %}{% include 'roles/maintain/nginx-proxy/auth.conf' %}
proxy_pass $backend; proxy_pass $backend;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header X-Forwarded-Port 443;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Ssl on;
{%- if pillar['nginx'][server]['proxy_headers'] is defined -%}
{%- for header in pillar['nginx'][server]['proxy_headers'] %}
proxy_set_header {{header}} {{pillar['nginx'][server]['proxy_headers'][header]}};
{%- endfor %}
{%- endif %}
# re-write redirects to http as to https, example: /home # re-write redirects to http as to https, example: /home
proxy_redirect http:// https://; proxy_redirect http:// https://;