From 63b190ccbd96a598deb6551037cf6e2de610114d Mon Sep 17 00:00:00 2001
From: Teck Meng <furyx@hotmail.com>
Date: Thu, 30 May 2024 19:22:36 +0800
Subject: [PATCH] Refactor traefik.yml to fix routing rules for chat and bot
 subdomains

---
 compose/deploy-librechat.yml | 12 ++++++++++--
 compose/traefik/traefik.yml  | 26 +++++++++++++-------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/compose/deploy-librechat.yml b/compose/deploy-librechat.yml
index 67c8576..c9f25ce 100644
--- a/compose/deploy-librechat.yml
+++ b/compose/deploy-librechat.yml
@@ -9,8 +9,8 @@ volumes:
   meili_data:
 
 services:
-  api:
-    container_name: LibreChat
+  librechat_api:
+    container_name: librechat_api
     ports:
       - "${PORT}:${PORT}"
     depends_on:
@@ -36,6 +36,14 @@ services:
       - type: bind
         source: ./config/librechat.yaml
         target: /app/librechat.yaml
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.librechat.entrypoints=web-secure"
+      - "traefik.http.routers.librechat.rule=Host(`chat.${DOMAINNAME}`) || Host(`bot.${DOMAINNAME}`)"
+      - "traefik.http.routes.librechat.middlewares=csrf@file"
+      - "traefik.http.routers.librechat.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.librechat.service=librechat_app"
+      - "traefik.http.services.librechat_app.loadbalancer.server.port=${PORT}"
   mongodb:
     container_name: chat-mongodb
     image: mongo
diff --git a/compose/traefik/traefik.yml b/compose/traefik/traefik.yml
index 642e234..da69c22 100644
--- a/compose/traefik/traefik.yml
+++ b/compose/traefik/traefik.yml
@@ -95,15 +95,15 @@ http:
 
   routers:
 
-    chat-router:
-      entryPoints:
-        - web-secure
-      rule: "Host(`bot.furyhawk.lol`) || Host(`chat.furyhawk.lol`)"
-      middlewares:
-        - csrf
-      tls:
-        certResolver: letsencrypt
-      service: librechat_app
+    # chat-router:
+    #   entryPoints:
+    #     - web-secure
+    #   rule: "Host(`bot.furyhawk.lol`) || Host(`chat.furyhawk.lol`)"
+    #   middlewares:
+    #     - csrf
+    #   tls:
+    #     certResolver: letsencrypt
+    #   service: librechat_app
 
     # forum-router:
     #   entryPoints:
@@ -258,10 +258,10 @@ http:
     #   loadBalancer:
     #     servers:
     #       - url: http://kestra:8080
-    librechat_app:
-      loadBalancer:
-        servers:
-          - url: http://LibreChat:3080
+    # librechat_app:
+    #   loadBalancer:
+    #     servers:
+    #       - url: http://LibreChat:3080
     # neo4j-bolt:
     #   loadBalancer:
     #     servers: