lingble/archived-Mailu
1
0
Fork 0
mirror of https://github.com/lingble/Mailu.git synced 2026-03-20 03:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2078

Browse Source
This commit is contained in:
Dimitri Huisman
2021-12-14 15:10:28 +00:00
parent dbbfa44461
commit 5bedcc1cb1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/nginx/conf/nginx.conf
View File

@@ -135,7 +135,7 @@ http {
# Actual logic
{% if ADMIN == 'true' or WEBMAIL != 'none' %}
location ~ ^/(sso|static) {
location ~ ^/(sso|static)/ {
include /etc/nginx/proxy.conf;
proxy_pass http://$admin;
}
@@ -165,7 +165,12 @@ http {
proxy_pass http://$webmail;
}
{% if WEB_WEBMAIL == '/' %}
location /sso.php {
{% endif %}
{% if WEB_WEBMAIL != '/' %}
location {{ WEB_WEBMAIL }}/sso.php {
{% endif %}
{% if WEB_WEBMAIL != '/' %}
rewrite ^({{ WEB_WEBMAIL }})$ $1/ permanent;
rewrite ^{{ WEB_WEBMAIL }}/(.*) /$1 break;

1
towncrier/newsfragments/2078.fix Normal file
View File

@@ -0,0 +1 @@
SSO login page to webmail did not work if WEB_WEBMAIL=/ was set.