six_002

云服务/hudieCompose.yaml

@@ -12,6 +12,9 @@ services:
             - redisData:/data
         networks:
             - xiao_network
+    
+    
+    
     django_postgres: # postgres镜像
         image: postgres
         container_name: django_postgres
@@ -30,18 +33,14 @@ services:
     
     django_frps:
         image: snowdreamtech/frps
-        container_name: xiao_frps
+        container_name: django_frps
         restart: unless-stopped
-          #        ports:
-          #            - "7000:7000/tcp"    # frpc 控制
-          #            - "7000:7000/udp"    # 如果要 KCP
-        #            - "7002:7002/udp"    # QUIC
-        #            - "8080:8080/tcp"    # vhostHTTPPort，给 Caddy 反代用
-        #            - "7500:7500/tcp"    # dashboard，也可让 Caddy 反代后不 export
         volumes:
             - /home/ubuntu/sixfrps.toml:/etc/frp/frps.toml
         environment:
             - FRP_CONFIG_FILE=/etc/frp/frps.toml
+        ports:
+            - "7000:7000"
         networks:
             - xiao_network
     
@@ -52,6 +51,7 @@ services:
         container_name: django_caddy
         volumes:
             - /home/ubuntu/Caddyfile:/etc/caddy/Caddyfile
+            - caddyData:/data
         ports:
             - "80:80"
             - "443:443"  # HTTPS 端口
@@ -67,7 +67,7 @@ services:
         environment:
             - USER_UID=1000
             - USER_GID=1000
-            - GITEA__server__ROOT_URL=https://gitea.sixgou.com/
+            - GITEA__server__ROOT_URL=https://caddy.sixgou.com/
         restart: always
         volumes:
             - gitea:/data

云服务/sixfrps.toml

@@ -1,11 +1,3 @@
-#bindPort = 7000
-#
-#vhostHTTPSPort = 443
-#vhostHTTPPort = 80
-#
-#auth.method = "token"
-#auth.token = "sixsixgousite"
-#
 # ===== 监听 =====
 bindAddr = "0.0.0.0"
 bindPort = 7000            # frpc 连这台服的端口

本地服务/sixfrpc.toml

@@ -33,7 +33,7 @@ customDomains = ["xiao.sixgou.com"]
 name = "wechat-django"
 type = "http"
 localIP = "127.0.0.1"   #localIP = "host.docker.internal"
-localPort = 3000 # 这里的端口号: 就是监听的本地服务的端口号
+localPort = 8000 # 这里的端口号: 就是监听的本地服务的端口号
 customDomains = ["wechat.sixgou.com"]
 
 

本地服务/yanhuafrpc.toml

@@ -1,17 +0,0 @@
-serverAddr = "122.152.209.38"
-serverPort = 7000
-# 认证方式和token，必须与frps配置一致
-auth.method = "token"
-auth.token = "sixsixgousite"
-
-[[proxies]]
-name = "yanhua"
-type = "https"
-customDomains = ["django.jpyanhua.site"]
-[proxies.plugin]
-type = "https2http"
-localAddr = "host.docker.internal:8001"
-crtPath = "/etc/frp/yanhuassl/django.jpyanhua.site_bundle.crt"
-keyPath = "/etc/frp/yanhuassl/django.jpyanhua.site.key"
-hostHeaderRewrite = "127.0.0.1"
-requestHeaders.set.x-from-where = "frp"