From 3d7459c1f48e76c2e4eb1d35f2ad47420c592628 Mon Sep 17 00:00:00 2001
From: Bruce Chen <805899926@qq.com>
Date: Wed, 16 Oct 2024 10:27:50 +0800
Subject: [PATCH] #

---
 .../nginx/node/nas/conf/conf.d/openwrt.conf   | 47 -------------------
 .../app/traefik/node/nas/conf/conf.d/app.yml  | 19 +-------
 .../conf/nginx/conf.d/default.conf            | 25 ++++------
 server/docker/os/ubuntu-openwrt/deploy.yml    | 10 ++--
 4 files changed, 14 insertions(+), 87 deletions(-)
 delete mode 100644 server/docker/app/nginx/node/nas/conf/conf.d/openwrt.conf

diff --git a/server/docker/app/nginx/node/nas/conf/conf.d/openwrt.conf b/server/docker/app/nginx/node/nas/conf/conf.d/openwrt.conf
deleted file mode 100644
index 59388bfaf..000000000
--- a/server/docker/app/nginx/node/nas/conf/conf.d/openwrt.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-server {
-    http2 on;
-    listen       80;
-    listen      443 ssl;
-    server_name  openwrt-firmware.czy21-internal.com;
-
-    ssl_certificate     /etc/nginx/cert/czy21-internal.com.crt;
-    ssl_certificate_key /etc/nginx/cert/czy21-internal.com.key;
-
-    location / {
-
-        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;
-
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-
-        proxy_pass http://openwrt-content:8081;
-    }
-}
-
-
-server {
-    http2 on;
-    listen       80;
-    listen      443 ssl;
-    server_name  openwrt-download.czy21-internal.com;
-
-    ssl_certificate     /etc/nginx/cert/czy21-internal.com.crt;
-    ssl_certificate_key /etc/nginx/cert/czy21-internal.com.key;
-    
-    location / {
-
-        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;
-
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-
-        proxy_pass http://openwrt-content:8082;
-    }
-}
-
diff --git a/server/docker/app/traefik/node/nas/conf/conf.d/app.yml b/server/docker/app/traefik/node/nas/conf/conf.d/app.yml
index b99ed5138..bf05c82d5 100644
--- a/server/docker/app/traefik/node/nas/conf/conf.d/app.yml
+++ b/server/docker/app/traefik/node/nas/conf/conf.d/app.yml
@@ -5,21 +5,4 @@ http:
       service: alist@docker
     openwrt-firmware:
       rule: Host(`openwrt-firmware.czy21-internal.com`)
-      service: openwrt-content@docker
-      middlewares:
-        - openwrt-firmware-proxy
-    openwrt-download:
-      rule: Host(`openwrt-download.czy21-internal.com`)
-      service: openwrt-content@docker
-      middlewares:
-        - openwrt-download-proxy
-
-  middlewares:
-    openwrt-download-proxy:
-      replacePathRegex:
-        regex: "^/"
-        replacement: "/download/"
-    openwrt-firmware-proxy:
-      replacePathRegex:
-        regex: "^/"
-        replacement: "/firmware/"
\ No newline at end of file
+      service: openwrt-firmware@docker
\ No newline at end of file
diff --git a/server/docker/os/ubuntu-openwrt/conf/nginx/conf.d/default.conf b/server/docker/os/ubuntu-openwrt/conf/nginx/conf.d/default.conf
index 6d5ca2cab..fec3559a7 100644
--- a/server/docker/os/ubuntu-openwrt/conf/nginx/conf.d/default.conf
+++ b/server/docker/os/ubuntu-openwrt/conf/nginx/conf.d/default.conf
@@ -1,25 +1,16 @@
-
 server {
-    listen 8081;
+    listen 80;
     server_name localhost;
-
-    port_in_redirect off;
-
+    
     location / {
-        alias /data/firmware/;
+        root /data/firmware/;
+        index index.html;
+        try_files $uri $uri/ /index.html;
     }
-}
-
-server {
-    listen 8082;
-    server_name localhost;
-
-    port_in_redirect off;
-
-    add_header Access-Control-Allow-Origin *;
 
-    location / {
-        alias /data/download/;
+    location /download {
+        root /data/;
         autoindex on;
     }
+
 }
\ No newline at end of file
diff --git a/server/docker/os/ubuntu-openwrt/deploy.yml b/server/docker/os/ubuntu-openwrt/deploy.yml
index bcc4657bf..c76d48512 100644
--- a/server/docker/os/ubuntu-openwrt/deploy.yml
+++ b/server/docker/os/ubuntu-openwrt/deploy.yml
@@ -2,8 +2,8 @@ version: "3.9"
 
 x-traefik-label: &traefik-label
   traefik.enable: true
-  traefik.http.routers.openwrt-content.service: openwrt-content
-  traefik.http.services.openwrt-content.loadbalancer.server.port: 80
+  traefik.http.routers.openwrt-firmware.service: openwrt-content
+  traefik.http.services.openwrt-firmware.loadbalancer.server.port: 80
 
 services:
   openwrt-builder:
@@ -17,13 +17,13 @@ services:
       - {{ param_docker_data }}/{{ param_role_name }}/data/:/data/
     restart: always
 
-  openwrt-content:
+  openwrt-firmware:
     image: nginx:1.27.0-alpine
     labels:
       <<: *traefik-label
     pull_policy: always
-    container_name: openwrt-content
-    hostname: openwrt-builder
+    container_name: openwrt-firmware
+    hostname: openwrt-firmware
     volumes:
       - {{ param_docker_data }}/{{ param_role_name }}/conf/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
       - {{ param_docker_data }}/{{ param_role_name }}/data/:/data/