Simplify webmail logout.

master
Dimitri Huisman 3 years ago
parent aab258d284
commit 5232bd38fd

@ -192,12 +192,6 @@ http {
return 302 /sso/login?next=ui.webmail; return 302 /sso/login?next=ui.webmail;
} }
location ^~ {{ WEB_WEBMAIL }}/sso/ui/logout {
include /etc/nginx/proxy.conf;
rewrite ^{{ WEB_WEBMAIL }}/sso/ui/logout$ /sso/logout break;
proxy_pass http://$admin;
}
location ^~ /ui/webmail { location ^~ /ui/webmail {
include /etc/nginx/proxy.conf; include /etc/nginx/proxy.conf;
return 302 {{ WEB_WEBMAIL }}; return 302 {{ WEB_WEBMAIL }};

@ -9,7 +9,7 @@ allow_admin_panel = Off
[labs] [labs]
allow_gravatar = Off allow_gravatar = Off
custom_login_link='sso.php' custom_login_link='sso.php'
custom_logout_link='sso/ui/logout' custom_logout_link='/sso/logout'
[contacts] [contacts]
enable = On enable = On

@ -41,7 +41,7 @@ if (filter_var(getenv('ADMIN'), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)
} }
$config['product_name'] = 'Mailu Webmail'; $config['product_name'] = 'Mailu Webmail';
array_push($config['plugins'], 'mailu'); array_push($config['plugins'], 'mailu');
$config['sso_logout_url'] = 'sso/ui/logout'; $config['sso_logout_url'] = '/sso/logout';
// We access the IMAP and SMTP servers locally with internal names, SSL // We access the IMAP and SMTP servers locally with internal names, SSL
// will obviously fail but this sounds better than allowing insecure login // will obviously fail but this sounds better than allowing insecure login

Loading…
Cancel
Save