Compare commits

..

No commits in common. "0d71dab54221452848c581f4ca0ae1069316c663" and "dd60a1755cc980d7758067d4ffb107204045a7d6" have entirely different histories.

15 changed files with 8 additions and 20 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

@ -1,3 +1,10 @@
nginx:
cloud:
auth: none
https:
port: 8080
prot: http
portal: portal:
Misc: Misc:
cloud: cloud:

View file

@ -928,7 +928,7 @@ extension=intl
;extension=odbc ;extension=odbc
;zend_extension=opcache ;zend_extension=opcache
;extension=pdo_dblib ;extension=pdo_dblib
extension=pdo_mysql ;extension=pdo_mysql
;extension=pdo_odbc ;extension=pdo_odbc
;extension=pdo_pgsql ;extension=pdo_pgsql
;extension=pdo_sqlite ;extension=pdo_sqlite

View file

@ -38,11 +38,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

@ -37,17 +37,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://;