diff --git a/.github/workflows/reload-dns.yml b/.github/workflows/reload-dns.yml deleted file mode 100644 index 540ac7f..0000000 --- a/.github/workflows/reload-dns.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: reload-dns -concurrency: fogtype.com -on: - workflow_dispatch: - schedule: - # 土曜日 02:30 (JST) は 金曜日 17:30 (UTC) - # https://time.is/compare/JST - # https://crontab.guru/#30_17_*_*_FRI - - cron: 30 17 * * FRI -jobs: - main: - runs-on: ubuntu-latest - steps: - - run: install -m 700 -d ~/.ssh - - run: install -m 600 <(echo '${{ secrets.DEPLOY_KEY }}') ~/.ssh/deploy_key - - run: ssh -i ~/.ssh/deploy_key -o 'StrictHostKeyChecking no' kou029w@fogtype.com 'sh -c "cd ~/fogtype.com && docker compose restart dns"' diff --git a/compose.yml b/compose.yml index 9241273..bac55a1 100644 --- a/compose.yml +++ b/compose.yml @@ -15,28 +15,6 @@ services: - caddy_config:/config networks: - fogtype - dns: - image: coredns/coredns:1.11.1@sha256:1eeb4c7316bacb1d4c8ead65571cd92dd21e27359f0d4917f1a5822a73b75db1 - restart: unless-stopped - expose: ["443"] - ports: - - "853:853" - - "127.0.0.1:9153:9153" - volumes: - - ./etc/coredns:/etc/coredns - - coredns_data:/var/lib/coredns - command: "-conf /etc/coredns/Corefile" - networks: - - fogtype - cron: - image: alpine:3.20@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f25238ebd - restart: unless-stopped - volumes: - - ./etc/periodic:/etc/periodic:ro - - caddy_data:/var/lib/caddy/data:ro - - coredns_data:/var/lib/coredns - init: true - command: ["/usr/sbin/crond", "-f", "-L", "/dev/stdout"] gts: image: superseriousbusiness/gotosocial:0.15.0@sha256:0b5d2a6707d0ecb841644141cd823d73cb3421dd7db78fe0f403dbe2d5fe33f4 restart: unless-stopped @@ -82,7 +60,6 @@ services: volumes: caddy_data: caddy_config: - coredns_data: gotosocial_data: maddy_data: headscale_data: diff --git a/etc/caddy/Caddyfile b/etc/caddy/Caddyfile index 359bccd..dd685f9 100644 --- a/etc/caddy/Caddyfile +++ b/etc/caddy/Caddyfile @@ -9,13 +9,6 @@ fogtype.com { www.fogtype.com { redir https://fogtype.com{uri} 308 } -dns.fogtype.com { - reverse_proxy /dns-query https://dns { - transport http { - tls_server_name dns.fogtype.com - } - } -} net.fogtype.com { reverse_proxy headscale:8080 } diff --git a/etc/coredns/Corefile b/etc/coredns/Corefile deleted file mode 100644 index 21b7a86..0000000 --- a/etc/coredns/Corefile +++ /dev/null @@ -1,12 +0,0 @@ -https://. tls://. { - tls /var/lib/coredns/certificates/acme-v02.api.letsencrypt.org-directory/dns.fogtype.com/dns.fogtype.com.crt /var/lib/coredns/certificates/acme-v02.api.letsencrypt.org-directory/dns.fogtype.com/dns.fogtype.com.key - reload - prometheus 0.0.0.0:9153 - cache 10 - hosts { - fallthrough - } - forward . tls://1.1.1.1 tls://1.0.0.1 { - tls_servername tls.cloudflare-dns.com - } -} diff --git a/etc/periodic/weekly/certificates b/etc/periodic/weekly/certificates deleted file mode 100755 index 575ec81..0000000 --- a/etc/periodic/weekly/certificates +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -eu -install \ - -D \ - -m 644 \ - -t /var/lib/coredns/certificates/acme-v02.api.letsencrypt.org-directory/dns.fogtype.com/ \ - /var/lib/caddy/data/caddy/certificates/acme-v02.api.letsencrypt.org-directory/dns.fogtype.com/dns.fogtype.com.*