Bladeren bron

fix dnspod caddy

lushuncheng 5 jaren geleden
bovenliggende
commit
40848e32a6
3 gewijzigde bestanden met toevoegingen van 38 en 38 verwijderingen
  1. 11 11
      config/caddy/Caddyfile
  2. 1 1
      dockerfile/caddy/Dockerfile
  3. 26 26
      dockerfile/common.yml

+ 11 - 11
config/caddy/Caddyfile

@@ -5,55 +5,55 @@
 }
 test-jishuin.proginn.com, *.test-jishuin.proginn.com {
     tls i@shuncheng.lu {
-        dns lego_deprecated dnspod
+        dns dnspod {env.DNSPOD_TOKEN}
     } 
     reverse_proxy http://10.200.200.200
 }
 test-kaifain.proginn.com, *.test-kaifain.proginn.com {
     tls i@shuncheng.lu {
-        dns lego_deprecated dnspod
+        dns dnspod {env.DNSPOD_TOKEN}
     } 
     reverse_proxy http://10.200.200.200
 }
 test-job.proginn.com, *.test-job.proginn.com {
     tls i@shuncheng.lu {
-        dns lego_deprecated dnspod
+        dns dnspod {env.DNSPOD_TOKEN}
     } 
     reverse_proxy http://10.200.200.200
 }
 *.test.proginn.com {
     tls i@shuncheng.lu {
-        dns lego_deprecated dnspod
+        dns dnspod {env.DNSPOD_TOKEN}
     } 
     reverse_proxy http://10.200.200.200
 }
 test-rooter.proginn.com, *.test-rooter.proginn.com {
     tls i@shuncheng.lu {
-        dns lego_deprecated dnspod
+        dns dnspod {env.DNSPOD_TOKEN}
     } 
     reverse_proxy http://10.200.200.200
 }
 prod-jishuin.proginn.com, *.prod-jishuin.proginn.com {
     tls i@shuncheng.lu {
-        dns lego_deprecated dnspod
+        dns dnspod {env.DNSPOD_TOKEN}
     } 
     reverse_proxy http://172.17.201.2 http://172.17.66.177:80
 }
 *.prod.proginn.com {
     tls i@shuncheng.lu {
-        dns lego_deprecated dnspod
+        dns dnspod {env.DNSPOD_TOKEN}
     } 
     reverse_proxy http://172.17.201.2 http://172.17.66.177:80
 }
 prod-rooter.proginn.com, *.prod-rooter.proginn.com {
     tls i@shuncheng.lu {
-        dns lego_deprecated dnspod
+        dns dnspod {env.DNSPOD_TOKEN}
     } 
     reverse_proxy http://172.17.201.2 http://172.17.66.177:80
 }
 test-git.gitinn.com {
     tls i@shuncheng.lu {
-        dns lego_deprecated dnspod
+        dns dnspod {env.DNSPOD_TOKEN}
     } 
     reverse_proxy http://10.200.200.200
 }
@@ -61,7 +61,7 @@ test-git.gitinn.com {
 # cps
 cps.test.proginn.com {
     tls i@shuncheng.lu {
-        dns lego_deprecated dnspod
+        dns dnspod {env.DNSPOD_TOKEN}
     } 
     reverse_proxy http://10.200.0.1:8801
 }
@@ -69,7 +69,7 @@ cps.test.proginn.com {
 # jishuin mobile
 jishuin-m.test.proginn.com {
     tls i@shuncheng.lu {
-        dns lego_deprecated dnspod
+        dns dnspod {env.DNSPOD_TOKEN}
     } 
     reverse_proxy http://10.200.0.1:8801
 }

+ 1 - 1
dockerfile/caddy/Dockerfile

@@ -1,7 +1,7 @@
 FROM caddy:2.1.1-builder AS builder
 ENV GOPROXY https://goproxy.cn
 RUN caddy-builder \
-    github.com/caddy-dns/lego-deprecated 
+    github.com/lscgzwd/caddy-dnspod
 
 FROM caddy:2.1.1
 

+ 26 - 26
dockerfile/common.yml

@@ -1,31 +1,31 @@
 version: "3.5"
 services:
-  #caddy:
-  #  build: ./caddy
-  #  container_name: caddy
-  #  environment:
-  #    - DNSPOD_API_KEY=126423,ab664ee7db2b8511bf1415b3cc361095
-  #    - DNSPOD_TTL=600
-  #  ulimits:
-  #    nofile:
-  #      soft: "1048576"
-  #      hard: "1048576"
-  #    nproc:
-  #      soft: "1048576"
-  #      hard: "1048576"
-  #    memlock:
-  #      soft: -1
-  #      hard: -1
-  #  volumes:
-  #    - /workspace/proginn2/caddy/data:/data
-  #    - /workspace/proginn2/caddy/config:/config
-  #    - ../config/caddy/Caddyfile:/etc/caddy/Caddyfile
-  #  ports:
-  #    - 80:80
-  #    - 443:443
-  #  networks:
-  #    proginn:
-  #      ipv4_address: 10.200.200.206
+  caddy:
+    build: ./caddy
+    container_name: caddy
+    environment:
+      - DNSPOD_TOKEN=126423,ab664ee7db2b8511bf1415b3cc361095
+      - DNSPOD_TTL=600
+    ulimits:
+      nofile:
+        soft: "1048576"
+        hard: "1048576"
+      nproc:
+        soft: "1048576"
+        hard: "1048576"
+      memlock:
+        soft: -1
+        hard: -1
+    volumes:
+      - /workspace/proginn2/caddy/data:/data
+      - /workspace/proginn2/caddy/config:/config
+      - ../config/caddy/Caddyfile:/etc/caddy/Caddyfile
+    ports:
+      - 80:80
+      - 443:443
+    networks:
+      proginn:
+        ipv4_address: 10.200.200.206
   nginx:
     restart: always
     image: "registry.cn-beijing.aliyuncs.com/lscgzwd/ubuntu18.04-php7:latest"