From eedfacbfa285b06fc983f534daad6b8e4df331b0 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 12 Jul 2017 11:27:33 +0200 Subject: [PATCH] Set X-Forwarded-Proto to get https prefix in omniauth generated callback urls. Relateed to issue #1240. --- contrib/nginx/zammad.conf | 2 ++ contrib/nginx/zammad_ssl.conf | 2 ++ 2 files changed, 4 insertions(+) diff --git a/contrib/nginx/zammad.conf b/contrib/nginx/zammad.conf index 7bb4fcc25..279d35f51 100644 --- a/contrib/nginx/zammad.conf +++ b/contrib/nginx/zammad.conf @@ -33,6 +33,7 @@ server { proxy_set_header Connection "Upgrade"; proxy_set_header CLIENT_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 86400; proxy_pass http://zammad-websocket; } @@ -41,6 +42,7 @@ server { proxy_set_header Host $http_host; proxy_set_header CLIENT_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 180; proxy_pass http://zammad; diff --git a/contrib/nginx/zammad_ssl.conf b/contrib/nginx/zammad_ssl.conf index 248790af3..de55f36ed 100644 --- a/contrib/nginx/zammad_ssl.conf +++ b/contrib/nginx/zammad_ssl.conf @@ -124,6 +124,7 @@ server { proxy_set_header Connection "Upgrade"; proxy_set_header CLIENT_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 86400; proxy_pass http://zammad-websocket; } @@ -132,6 +133,7 @@ server { proxy_set_header Host $http_host; proxy_set_header CLIENT_IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; proxy_read_timeout 180; proxy_pass http://zammad;