caddy: new frontend

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "frontend"]
+	path = frontend
+	url = https://github.com/sjtug/sjtug-mirror-frontend

caddy-gen/src/caddy-gen.py

@@ -19,11 +19,7 @@ def is_local(base: str):
 
 def common() -> list[Node]:
     frontends = Node("handle", [
-        Node('file_server /*', [
-            Node(f'root {FRONTEND_DIR}')
-        ]),
-        Node('rewrite /docs/* /', comment='for react app'),
-        *hidden()
+        Node('reverse_proxy /* frontend:3000'),
     ])
 
     lug = Node("handle /lug/*", [

caddy/Caddyfile.siyuan

@@ -135,12 +135,7 @@ https://mirror.sjtu.edu.cn {
     }
 
     handle {
-        file_server /* {
-            root /dists
-        }
-        rewrite /docs/* /  # for react app
-        @hidden path */.*
-        respond @hidden 404
+        reverse_proxy /* frontend:3000
     }
 
     handle /lug/* {

caddy/Caddyfile.zhiyuan

@@ -109,12 +109,7 @@ https://mirrors.sjtug.sjtu.edu.cn {
     }
 
     handle {
-        file_server /* {
-            root /dists
-        }
-        rewrite /docs/* /  # for react app
-        @hidden path */.*
-        respond @hidden 404
+        reverse_proxy /* frontend:3000
     }
 
     handle /lug/* {

docker-compose.siyuan.yml

@@ -1,4 +1,9 @@
 services:
+  frontend:
+    container_name: siyuan-frontend
+    mem_limit: 1G
+    memswap_limit: 1G
+
   caddy:
     container_name: siyuan-caddy
     volumes:

docker-compose.yml

@@ -37,6 +37,29 @@ services:
         soft: 80000
         hard: 120000
 
+  frontend:
+    restart: unless-stopped
+    build:
+      context: ./frontend
+    networks:
+      - ipv6-service-net
+    expose:
+      - 3000
+    healthcheck:
+      test: curl -f http://localhost || exit 1
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+    logging:
+      options:
+        max-size: "4M"
+        max-file: "20"
+    ulimits:
+      nofile:
+        soft: 80000
+        hard: 120000
+
   lug:
     restart: unless-stopped
     command: -c /config.yaml

docker-compose.zhiyuan.yml

@@ -1,4 +1,9 @@
 services:
+  frontend:
+    container_name: zhiyuan-frontend
+    mem_limit: 1G
+    memswap_limit: 1G
+
   caddy:
     container_name: zhiyuan-caddy
     volumes: