Merge remote-tracking branch 'upstream/develop' into media-proxy

This commit is contained in:
href 2017-12-11 02:45:28 +01:00
commit 9093b2cf49
No known key found for this signature in database
GPG key ID: EE8296C1A152C325
19 changed files with 226 additions and 39 deletions

View file

@ -22,6 +22,9 @@ server {
server_name example.tld;
location / {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://localhost:4000;
}