31.diff (4765B)
1 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml 2 index 0e63cbe..4db5944 100644 3 --- a/.github/workflows/deploy.yml 4 +++ b/.github/workflows/deploy.yml 5 @@ -22,3 +22,4 @@ jobs: 6 POWERDNS_API_KEY_NS1: ${{ secrets.POWERDNS_API_KEY_NS1 }} 7 POWERDNS_API_KEY_NS2: ${{ secrets.POWERDNS_API_KEY_NS2 }} 8 POWERDNS_API_KEY_NS3: ${{ secrets.POWERDNS_API_KEY_NS3 }} 9 + CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} 10 diff --git a/.github/workflows/force_deploy.yml b/.github/workflows/force_deploy.yml 11 index 0820823..90ba3cc 100644 12 --- a/.github/workflows/force_deploy.yml 13 +++ b/.github/workflows/force_deploy.yml 14 @@ -36,6 +36,7 @@ jobs: 15 POWERDNS_API_KEY_NS1: ${{ secrets.POWERDNS_API_KEY_NS1 }} 16 POWERDNS_API_KEY_NS2: ${{ secrets.POWERDNS_API_KEY_NS2 }} 17 POWERDNS_API_KEY_NS3: ${{ secrets.POWERDNS_API_KEY_NS3 }} 18 + CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} 19 20 - name: Set final commit status 21 uses: myrotvorets/set-commit-status-action@master 22 diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml 23 index d728484..f4cabca 100644 24 --- a/.github/workflows/pullrequest.yml 25 +++ b/.github/workflows/pullrequest.yml 26 @@ -59,6 +59,7 @@ jobs: 27 POWERDNS_API_KEY_NS1: ${{ secrets.POWERDNS_API_KEY_NS1 }} 28 POWERDNS_API_KEY_NS2: ${{ secrets.POWERDNS_API_KEY_NS2 }} 29 POWERDNS_API_KEY_NS3: ${{ secrets.POWERDNS_API_KEY_NS3 }} 30 + CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} 31 - name: Get plan output 32 id: meta 33 run: | 34 diff --git a/config/midnightthoughts.space.yaml b/config/midnightthoughts.space.yaml 35 index 64efe48..cce6477 100644 36 --- a/config/midnightthoughts.space.yaml 37 +++ b/config/midnightthoughts.space.yaml 38 @@ -27,23 +27,9 @@ 39 value: 40 exchange: mail.midnightthoughts.space. 41 preference: 10 42 - - ttl: 600 43 - type: NS 44 - values: 45 - - ns1.nordgedanken.dev. 46 - - ns2.nordgedanken.dev. 47 - - ns3.nordgedanken.dev. 48 - ttl: 1800 49 type: TXT 50 value: google-site-verification=YeO0rqvYWOZoW6yj3MRf77luDe9CURDbmPYLFYiBXo8 51 -aws: 52 - ttl: 600 53 - type: NS 54 - values: 55 - - ns-1048.awsdns-03.org. 56 - - ns-1883.awsdns-43.co.uk. 57 - - ns-221.awsdns-27.com. 58 - - ns-659.awsdns-18.net. 59 _dmarc.mail: 60 ttl: 1800 61 type: TXT 62 diff --git a/config/production.yaml b/config/production.yaml 63 index 7f20722..5f21a89 100644 64 --- a/config/production.yaml 65 +++ b/config/production.yaml 66 @@ -12,6 +12,33 @@ providers: 67 directory: ./config 68 default_ttl: 3600 69 enforce_order: false 70 + cloudflare: 71 + class: octodns_cloudflare.CloudflareProvider 72 + # The API Token or API Key. 73 + # Required permissions for API Tokens are Zone:Read, DNS:Read and DNS:Edit. 74 + # Page Rules:Edit is required for managing Page Rules (URLFWD) records. 75 + token: env/CLOUDFLARE_TOKEN 76 + # Import CDN enabled records as CNAME to {}.cdn.cloudflare.net. Records 77 + # ending at .cdn.cloudflare.net. will be ignored when this provider is 78 + # not used as the source and the cdn option is enabled. 79 + # 80 + # See: https://support.cloudflare.com/hc/en-us/articles/115000830351 81 + cdn: false 82 + # Manage Page Rules (URLFWD) records 83 + # pagerules: true 84 + # Optional. Default: 4. Number of times to retry if a 429 response 85 + # is received. 86 + #retry_count: 4 87 + # Optional. Default: 300. Number of seconds to wait before retrying. 88 + #retry_period: 300 89 + # Optional. Default: 50. Number of zones per page. 90 + #zones_per_page: 50 91 + # Optional. Default: 100. Number of dns records per page. 92 + #records_per_page: 100 93 + # Optional. Default: 120. Lowest TTL allowed to be set. 94 + # A different limit for (non-)enterprise zone applies. 95 + # See: https://developers.cloudflare.com/dns/manage-dns-records/reference/ttl 96 + #min_ttl: 120 97 powerdns_ns1: 98 class: octodns_powerdns.PowerDnsProvider 99 # The host on which PowerDNS api is listening (required) 100 @@ -43,10 +70,13 @@ providers: 101 # Send DNS NOTIFY to secondary servers after change (optional, default false) 102 # notify: false 103 zones: 104 - midnightthoughts.space.: &default 105 + midnightthoughts.space.: 106 + sources: [config] 107 + processors: [spf] 108 + targets: [cloudflare] 109 + nordgedanken.dev.: &default 110 sources: [config] 111 processors: [spf] 112 targets: [powerdns_ns1, powerdns_ns2, powerdns_ns3_v2] 113 #targets: [powerdns_ns2, powerdns_ns3_v2] 114 - nordgedanken.dev.: *default 115 miki.community.: *default 116 diff --git a/requirements.txt b/requirements.txt 117 index 54ffade..243a90d 100644 118 --- a/requirements.txt 119 +++ b/requirements.txt 120 @@ -1,3 +1,4 @@ 121 -octodns==1.2.1 122 +octodns==1.6.1 123 octodns-powerdns==0.0.5 124 octodns-spf==0.0.2 125 +octodns-cloudflare==0.0.5