Merge branch 'master' into cryptpad
This commit is contained in:
commit
e0260714d1
|
@ -1,4 +1,4 @@
|
|||
{% extends core.j2 %}
|
||||
{% extends "core.j2" %}
|
||||
|
||||
{% block extra_upstreams %}
|
||||
map $http_upgrade $connection_upgrade {
|
||||
|
@ -13,9 +13,9 @@ map $http_upgrade $connection_upgrade {
|
|||
root {{ item.root }};
|
||||
}
|
||||
location /server {
|
||||
proxy_pass {{ item.mumble_proto }}://{{ item.mumble_server }}:{{ item.mumble_port }};
|
||||
proxy_pass {{ item.proto }}://{{ item.server }}:{{ item.port }};
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection $connection_upgrade;
|
||||
}
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
Loading…
Reference in New Issue