Merge branch 'phperkaigi-2025'

1 files changed, 4 insertions, 21 deletions

diff --git a/nginx.conf b/nginx.conf
index f421647..08c9abf 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -3,28 +3,14 @@ events {
 }
 
 http {
-  # https://nginx.org/en/docs/http/websocket.html
-  map $http_upgrade $connection_upgrade {
-    default upgrade;
-    ''      close;
-  }
-
   server {
     listen 80;
 
-    location /iosdc-japan/2024/code-battle/files/ {
+    location /phperkaigi/2025/code-battle/files/ {
       alias /var/www/files/;
     }
 
-    location /iosdc-japan/2024/code-battle/api/ {
-      proxy_pass http://api-server;
-      proxy_set_header Host $host;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location /iosdc-japan/2024/code-battle/admin/ {
+    location /phperkaigi/2025/code-battle/api/ {
       proxy_pass http://api-server;
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
@@ -32,18 +18,15 @@ http {
       proxy_set_header X-Forwarded-Proto $scheme;
     }
 
-    location /iosdc-japan/2024/code-battle/sock/ {
+    location /phperkaigi/2025/code-battle/admin/ {
       proxy_pass http://api-server;
-      proxy_http_version 1.1;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection $connection_upgrade;
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
     }
 
-    location /iosdc-japan/2024/code-battle/ {
+    location /phperkaigi/2025/code-battle/ {
       proxy_pass http://app-server;
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;