diff --git a/certmgr/getcert.sh b/certmgr/getcert.sh index a4b108f..e08047c 100644 --- a/certmgr/getcert.sh +++ b/certmgr/getcert.sh @@ -1,8 +1,8 @@ #!/bin/bash # 定义变量 -DOMAIN="registry.deepseak.icu" # 主域名 -ADDITIONAL_DOMAINS=("active.deepseak.icu" "bbs.deepseak.icu" "image.deepseak.icu" "gitea.deepseak.icu") # 额外域名 +DOMAIN="stonelan.cn" # 主域名 +ADDITIONAL_DOMAINS=("gitea.stonelan.cn" "oneapi.stonelan.cn" "navidrome.stonelan.cn" "v.stonelan.cn" "sy.stonelan.cn" "registry.stonelan.cn" "image.stonelan.cn" "fastgpt.stonelan.cn" "membank.stonelan.cn") # 额外域名(与 nginx/conf.d 中的 server_name 对应) EMAIL="hpuzhagnwei@163.com" # 请替换为你的邮箱地址 # 检查 Certbot 是否安装 diff --git a/frpc-client/docker-compose.yml b/frpc-client/docker-compose.yml index ac51ecf..54f3160 100644 --- a/frpc-client/docker-compose.yml +++ b/frpc-client/docker-compose.yml @@ -1,6 +1,6 @@ services: frpc: - image: frpc-client:latest + image: frpc-client:09051708 container_name: frpc-client restart: unless-stopped networks: diff --git a/frpc-client/frpc.toml b/frpc-client/frpc.toml index b5a9f16..2ae5032 100644 --- a/frpc-client/frpc.toml +++ b/frpc-client/frpc.toml @@ -1,5 +1,5 @@ # frpc 基础配置 -serverAddr = "47.239.121.24" +serverAddr = "47.113.230.48" serverPort = 7000 auth.method = "token" auth.token = "8f3c9b7d5e2a4f6h1i0j" @@ -14,7 +14,7 @@ remotePort = 80 [[proxies]] name = "https" type = "tcp" -localIP = "10.0.3.148" +localIP = "10.0.3.173" localPort = 4430 remotePort = 443 diff --git a/nginx/Dockerfile b/nginx/Dockerfile index d925647..b75fcf9 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -22,6 +22,6 @@ RUN mkdir -p /var/log/nginx && \ EXPOSE 80 443 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \ - CMD wget --no-verbose --tries=1 --spider http://localhost/health || exit 1 + CMD wget --no-verbose --tries=1 --spider http://localhost/ || exit 1 CMD ["nginx", "-g", "daemon off;"] diff --git a/nginx/conf.d/fastgpt.conf b/nginx/conf.d/fastgpt.conf index e549e61..c44aefc 100644 --- a/nginx/conf.d/fastgpt.conf +++ b/nginx/conf.d/fastgpt.conf @@ -1,9 +1,9 @@ server { listen 80; - server_name fastgpt.membank.xyz; + server_name fastgpt.stonelan.cn; location / { - proxy_pass http://10.0.3.14:3000; + proxy_pass http://10.0.3.173:3000; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/nginx/conf.d/image.conf b/nginx/conf.d/image.conf index 5551905..68bad90 100644 --- a/nginx/conf.d/image.conf +++ b/nginx/conf.d/image.conf @@ -1,9 +1,9 @@ server { listen 80; - server_name image.membank.xyz; + server_name image.stonelan.cn; location / { - proxy_pass http://10.0.3.14:3004; + proxy_pass http://10.0.3.173:3004; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/nginx/conf.d/membank-xyz.conf b/nginx/conf.d/membank-xyz.conf index 26e016c..cb59451 100644 --- a/nginx/conf.d/membank-xyz.conf +++ b/nginx/conf.d/membank-xyz.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name membank.xyz; + server_name stonelan.cn; root /usr/share/nginx/html/membank; index index.html; diff --git a/nginx/conf.d/membank.conf b/nginx/conf.d/membank.conf index 6d2db53..f07e45a 100644 --- a/nginx/conf.d/membank.conf +++ b/nginx/conf.d/membank.conf @@ -1,9 +1,9 @@ server { listen 80; - server_name membank.membank.xyz; + server_name membank.stonelan.cn; location / { - proxy_pass http://10.0.3.148:3000; + proxy_pass http://10.0.3.173:3000; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -15,7 +15,7 @@ server { proxy_send_timeout 600s; } location /bbs-go { - proxy_pass http://10.0.3.148:9000; + proxy_pass http://10.0.3.173:9000; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/nginx/conf.d/navidrome.conf b/nginx/conf.d/navidrome.conf index c2913dc..b6bf3bd 100644 --- a/nginx/conf.d/navidrome.conf +++ b/nginx/conf.d/navidrome.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name navidrome.membank.xyz; + server_name navidrome.stonelan.cn; location / { proxy_pass http://127.0.0.1:4533; diff --git a/nginx/conf.d/oneapi.conf b/nginx/conf.d/oneapi.conf index d88a019..5aa0a9b 100644 --- a/nginx/conf.d/oneapi.conf +++ b/nginx/conf.d/oneapi.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name oneapi.membank.xyz; + server_name oneapi.stonelan.cn; location / { proxy_pass http://oneapi:3000; diff --git a/nginx/conf.d/registry.conf b/nginx/conf.d/registry.conf index c6bee66..95544f3 100644 --- a/nginx/conf.d/registry.conf +++ b/nginx/conf.d/registry.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name registry.membank.xyz; + server_name registry.stonelan.cn; client_max_body_size 500m; location / { diff --git a/nginx/conf.d/sy.conf b/nginx/conf.d/sy.conf index 392b69d..97ac35c 100644 --- a/nginx/conf.d/sy.conf +++ b/nginx/conf.d/sy.conf @@ -1,9 +1,9 @@ server { listen 80; - server_name sy.membank.xyz; + server_name sy.stonelan.cn; location / { - proxy_pass http://10.0.3.148:6806; + proxy_pass http://10.0.3.173:6806; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/nginx/conf.d/v.conf b/nginx/conf.d/v.conf index 11e655b..ed13dab 100644 --- a/nginx/conf.d/v.conf +++ b/nginx/conf.d/v.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name v.membank.xyz; + server_name v.stonelan.cn; location / { root /usr/share/nginx/html/v; diff --git a/nginx/docker-compose.yml b/nginx/docker-compose.yml index 17f27aa..1843c27 100644 --- a/nginx/docker-compose.yml +++ b/nginx/docker-compose.yml @@ -1,14 +1,16 @@ services: nginx: - image: nginx:alpine + image: nginx:09051708 container_name: nginx-proxy ports: - "8081:80" - "4430:443" - volumes: - - ./conf.d:/etc/nginx/conf.d:ro - - ./nginx.conf:/etc/nginx/nginx.conf:ro + # 配置已内嵌于镜像(构建时 COPY 进 /etc/nginx),故不挂载 conf.d restart: unless-stopped networks: - trim-default +networks: + trim-default: + external: true + diff --git a/迁移任务.md b/迁移任务.md new file mode 100644 index 0000000..5447dcd --- /dev/null +++ b/迁移任务.md @@ -0,0 +1,37 @@ +1. common-server-public 是局域网机器,需要部署服务的源码仓库 +2. 之前这些服务是运行在10.0.3.148 这个局域网机器上 +3. 现在我想把这些服务迁移到10.0.3.173 这个机器上 (用户名admin,密码admin123) +4. 公网服务器 47.113.230.48 用户名root , +密钥文件:-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAm4wORi72xnFMRReG2htd3fV/9ZFpwjbwfzEarP/BwGesjpxC +N3iu1tmLoD1shlrBRFZzpXaMmbprB3CX8rQVN0hPlRJpHvBkS88E4Z5YRSGQt7Ox +7Q0wwvVwu/jzs8tPkcjBXBqssu95xkwQNCXG2dJmmVx4/LxTHXnnX0Hi30TQ9BlC +prjXoYe41q81VBYE+R2khT0AeYX0UKljWuWERCug9tmNZzPVY/hXHq0KG0MIVSGF +0aszQkkjPHJoG4XzY+mtQChugiOQoq/Ti3jDS/rKQ9E/O833Gv4yZ+s9QIWT9sPA +U7UEwpy0ScIYldtCpuGjvZr3OEuk5DUJL7e6GwIDAQABAoIBAC/IcBAeWD+wyVnG +Nu5kjsrjIlppP8BiSTIBfyza6oW1M3yhwvOwdqFYtfxVMjP5yDo6ho8zYlDNRBjG +fV8Y9BWF+LCWNcXD2kOxhlHa50nhXEgagxOLxEl3xZhxC0hVsg1aSxAEv72+ND32 +2tlyK2p5qHv/PMmC/tNkwe9w2YV1by9MM1n1yVM0oGMH+WaLFeUAEjfatFTMgQA2 +QqUP5COtyTmpTtadxE4SFasYLkck9nJ5V9En1MStg1fv+0F8BCiMEV6qxyTPbuaV +OP6VXntHAILOPLWD93E0BYX+s6iiA4nrurk99gJ8Bzr5xEL9fVofcizD6jMvLyZn +kkWAHokCgYEA0UyXCo1KYB3rC4XBKQqJWoVnQBX1IYudhjs1yZiMJ3J8FmXWs6PG +F1Pbv466OQpV844iOsTweAXEKp5wkge4R9fv8N8t6WvS+Jd6XBg1/gX/X8SaMlLz +I5hdcXCLrdlJNmsJb7H2qty83sPAZMdEupPizWiOMC9fSKZ2XNdVuUkCgYEAvkEV +rpBL8kDI872H067RZTHM/4edA19l7kTDefp4OJ3ObdebzVjwcT4k5hRvl3dI7qmj +pAC5TuXlZp2SGbTgdlFb/3h01Cv0wG3Ho73fTP4/EQgDrbdZoNeYWITTrbNehIu+ +UzAjfTXWQAFS+Nztng7t0dwluEooFp1r9hoiXEMCgYBXcNwZeHX+OgGcysCsWM6R +lvJP/9xtq1qgXdRW6PiE8nuND/bnDiEQVeSU3xhGBF9sZZE/ZE/ilOYjuBXnrHn8 +6eZAh70yq+10FjT0jNjhy7epVwXkyGr0EA/Z+N8iPokrxwQmOf+H2ri9iKK0d9vq +5yX2Exx0XRY9z+3bU8tooQKBgQCWUI/T2rfWT681PCKLccyI2j7wCPJZzs6W4Qdc +YTMI8E0/ZaD4LfPSVNoMWksMbbdWsPrUQaonFuYXHBlpbAoIESHRhxcu5we53UJl +MUey6hFj4GQfpQQQWyZHkbI4w8XCjTIzQY5Yh+edrC4k51Bpl7v4GapHn3dq3reE +uoM5RwKBgAY908M6cq4xLS3vjUJp2/4g2lhjmFkzL6J1W+W2VhNoZdmRUVtvWn83 +s3pr5thV+h1JFHEJfH5/ImmXIRE+m5QEbu6GjL89E/AinJ0b0Kc0Wnn09w6Ryfd5 +oMpvG1iSkShB15LanB5DVFj8qTdJhxw6QoYcRagLBD6E/SVC13d4 +-----END RSA PRIVATE KEY----- + +5. 10.0.3.5 awei 123456 是一个ubuntu 环境 ,可以左右开发机使用 ,需要linux 环境时,比如docker build 等 +6. frpc 服务器地址,改成47.113.230.48 +7. 在47.113.230.48 这个机器上,给我部署frpcserver ,本地仓有frpc server 的代码 +8. 本地这个nginx部署到10.0.3.173 这个机器上,配置中的域名,更换为stonelan.cn,这是个飞牛系统,最好能让我在飞牛的docker 面板中 能看到这些容器 +9. 给我部署个gitea, gitean.stonelan.cn 映射好,考察本地仓库,你能明白应该如何修改