Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Set X-Forwarded-Proto to get https prefix in omniauth generated callback urls. Relateed to issue #1240.

Browse source
This commit is contained in:
Martin Edenhofer 2017-07-12 11:27:33 +02:00
parent 899daa6530
commit eedfacbfa2
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/nginx/zammad.conf
View file

@ -33,6 +33,7 @@ server {
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header CLIENT_IP $remote_addr; proxy_set_header CLIENT_IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 86400; proxy_read_timeout 86400;
proxy_pass http://zammad-websocket; proxy_pass http://zammad-websocket;
} }
@ -41,6 +42,7 @@ server {
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_set_header CLIENT_IP $remote_addr; proxy_set_header CLIENT_IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 180; proxy_read_timeout 180;
proxy_pass http://zammad; proxy_pass http://zammad;

2
contrib/nginx/zammad_ssl.conf
View file

@ -124,6 +124,7 @@ server {
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header CLIENT_IP $remote_addr; proxy_set_header CLIENT_IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 86400; proxy_read_timeout 86400;
proxy_pass http://zammad-websocket; proxy_pass http://zammad-websocket;
} }
@ -132,6 +133,7 @@ server {
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_set_header CLIENT_IP $remote_addr; proxy_set_header CLIENT_IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_read_timeout 180; proxy_read_timeout 180;
proxy_pass http://zammad; proxy_pass http://zammad;