Dimitri Huisman 3 years ago
parent dbbfa44461
commit 5bedcc1cb1

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

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