From 5ada43c2cefe253ada4f0737ee284428c7cbac93 Mon Sep 17 00:00:00 2001
From: ryester27 <17807258+ryester27@users.noreply.github.com>
Date: Thu, 7 Feb 2019 22:09:17 -0500
Subject: [PATCH] fix websocket proxying

---
 emby.subdomain.conf.sample | 17 +++++++++++++----
 emby.subfolder.conf.sample | 12 ++++++++++--
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/emby.subdomain.conf.sample b/emby.subdomain.conf.sample
index 3884df3..fc11bf4 100644
--- a/emby.subdomain.conf.sample
+++ b/emby.subdomain.conf.sample
@@ -1,6 +1,6 @@
 # make sure that your dns has a cname set for emby, if emby is running in bridge mode, the below config should work as is, although,
-# the container name is expected to be "emby", if not, replace the line "set $upstream_emby emby;" with "set $upstream_emby <containername>;"
-# for host mode, replace the line "proxy_pass http://$upstream_emby:8096;" with "proxy_pass http://HOSTIP:8096;" HOSTIP being the IP address of emby
+# the container name is expected to be "emby", if not, replace the lines "set $upstream_emby emby;" with "set $upstream_emby <containername>;"
+# for host mode, replace the lines "proxy_pass http://$upstream_emby:8096;" with "proxy_pass http://HOSTIP:8096;" HOSTIP being the IP address of emby
 # in emby settings, under "Advanced" change the public https port to 443, leave the local ports as is, set the "external domain" to your url,
 # and set the "Secure connection mode" to "Handled by reverse proxy"
 
@@ -19,9 +19,18 @@ server {
         resolver 127.0.0.11 valid=30s;
         set $upstream_emby emby;
         proxy_pass http://$upstream_emby:8096;
+		
         proxy_set_header Range $http_range;
         proxy_set_header If-Range $http_if_range;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
     }
+	
+    location ~ (/emby)?/socket {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_emby emby;
+        proxy_pass http://$upstream_emby:8096;
+		
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $http_connection;
+   }
 }
diff --git a/emby.subfolder.conf.sample b/emby.subfolder.conf.sample
index a6220df..1226ced 100644
--- a/emby.subfolder.conf.sample
+++ b/emby.subfolder.conf.sample
@@ -1,6 +1,6 @@
 # if emby is running in bridge mode, the below config should work as is, although, the container name is expected to be "emby",
-# if not, replace the line "set $upstream_emby emby;" with "set $upstream_emby <containername>;"
-# for host mode, replace the line "proxy_pass http://$upstream_emby:8096;" with "proxy_pass http://HOSTIP:8096;" HOSTIP being the IP address of emby
+# if not, replace the lines "set $upstream_emby emby;" with "set $upstream_emby <containername>;"
+# for host mode, replace the lines "proxy_pass http://$upstream_emby:8096;" with "proxy_pass http://HOSTIP:8096;" HOSTIP being the IP address of emby
 # in emby settings, under "Advanced" change the public https port to 443, leave the local ports as is, set the "external domain" to your url and subdomain,
 # and set the "Secure connection mode" to "Handled by reverse proxy"
 
@@ -15,6 +15,14 @@ location ^~ /emby/ {
     
     proxy_set_header Range $http_range;
     proxy_set_header If-Range $http_if_range;
+}
+
+location ^~ /embywebsocket {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_emby emby;
+    proxy_pass http://$upstream_emby:8096;
+
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $http_connection;
 }