Merge pull request #35 from neogenia-jp/feature/update-nginx-config-f…

…or-websocket-implicitly WebSocket の疎通を暗黙的にするように設定した
neogenia-jp · Jun 26, 2024 · 61dedf7 · 61dedf7
2 parents e3f2ae0 + 599b5dc
commit 61dedf7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/app/config_template_http.erb b/src/app/config_template_http.erb
@@ -14,6 +14,11 @@ map $http_x_forwarded_proto $xfp {
   "" $scheme;
 }
 
+map $http_connection $conn {
+  default keep-alive;        # for HTTP keepalive
+  upgrade upgrade;           # for WebSocket
+}
+
 # --- server definitions for plain HTTP ---
 server {
     server_name  <%= config.domain %>;
@@ -50,7 +55,9 @@ server {
         grpc_pass $target_upstream;
      <% else %>
         proxy_http_version 1.1;
-        proxy_set_header Connection "";  # for HTTP keepalive
+        # for WebSocket
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $conn;
 
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-Proto $xfp;

diff --git a/src/app/config_template_https.erb b/src/app/config_template_https.erb
@@ -14,6 +14,11 @@ map $http_x_forwarded_proto $xfp {
   "" $scheme;
 }
 
+map $http_connection $conn {
+  default keep-alive;        # for HTTP keepalive
+  upgrade upgrade;           # for WebSocket
+}
+
 # --- server definitions for plain HTTP ---
 server {
     server_name  <%= config.domain %>;
@@ -71,7 +76,9 @@ server {
         grpc_pass $target_upstream;
      <% else %>
         proxy_http_version 1.1;
-        proxy_set_header Connection "";  # for HTTP keepalive
+        # for WebSocket
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $conn;
 
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-Proto $xfp;