Merge remote-tracking branch 'remotes/origin/dev' into feature/metasuri

This commit is contained in:
Mike Reeves
2020-06-04 10:58:03 -04:00

View File

@@ -134,7 +134,7 @@ http {
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
} }
location ~ ^/auth/.*?(whoami|login|logout) { location ~ ^/auth/.*?(whoami|login|logout|settings) {
rewrite /auth/(.*) /$1 break; rewrite /auth/(.*) /$1 break;
proxy_pass http://{{ masterip }}:4433; proxy_pass http://{{ masterip }}:4433;
proxy_read_timeout 90; proxy_read_timeout 90;