docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly use x-forwarded-proto with redirects in the webui, related to #347

Browse Source 
(cherry picked from commit a4f46ced49)
This commit is contained in:
kaiyou
2017-12-04 21:16:08 +01:00
parent 46dc9b0b16
commit f5b78ffff0
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/nginx/conf/nginx.conf
View File

@@ -71,7 +71,7 @@ http {
location {{ WEB_WEBMAIL }} {
rewrite ^({{ WEB_WEBMAIL }})$ $1/ permanent;
rewrite ^{{ WEB_WEBMAIL }}/(.*) /$1 break;
proxy_set_header Host $host;
include /etc/nginx/proxy.conf;
proxy_pass http://$webmail;
}
{% endif %}
@@ -83,8 +83,8 @@ http {
location ~ {{ WEB_ADMIN }}/(ui|static) {
rewrite ^{{ WEB_ADMIN }}/(.*) /$1 break;
include /etc/nginx/proxy.conf;
proxy_set_header X-Forwarded-Prefix {{ WEB_ADMIN }};
proxy_set_header Host $host;
proxy_pass http://$admin;
}
@@ -102,6 +102,7 @@ http {
rewrite ^/webdav/(.*) /$1 break;
auth_request /internal/auth/basic;
auth_request_set $user $upstream_http_x_user;
include /etc/nginx/proxy.conf;
proxy_set_header X-Remote-User $user;
proxy_set_header X-Script-Name /webdav;
proxy_pass http://$webdav;