chore(global): cook things up with DNS related chores

Signed-off-by: Andrei Jiroh Halili <[email protected]>

.env

@@ -7,5 +7,5 @@ DOTENV_KEYS_LOADED=1
 DOTENV_PUBLIC_KEY="020c13c2e7b3510fe62231d2968375be7f35972e0f8c7a6691110133f72274a2b5"
 
 # .env
-CLOUDFLARE_API_TOKEN="encrypted:BKv61BfHcaxS9Z9RnXsXP9YgcugK4Ai1UyYk/tlSOyECeQ1qwFsLvltrxbGOo5lqQ/jzma/Q5o3MgznaWx2/5joeJTAqI+wJkkVfu89bqv1LQzoS0g+MbKiTWDNr0WsQEpxDal+7EMIk9w9vCLc1IQgUYC2Z7cbNDE+GTLizf94JdPqSDTNW2Co="
-CLOUDFLARE_TOKEN="encrypted:BKv61BfHcaxS9Z9RnXsXP9YgcugK4Ai1UyYk/tlSOyECeQ1qwFsLvltrxbGOo5lqQ/jzma/Q5o3MgznaWx2/5joeJTAqI+wJkkVfu89bqv1LQzoS0g+MbKiTWDNr0WsQEpxDal+7EMIk9w9vCLc1IQgUYC2Z7cbNDE+GTLizf94JdPqSDTNW2Co="
+CLOUDFLARE_TOKEN="encrypted:BOjtLj9PLOmryNosK1a/N/4IJ/bU7QRytKSEn6dmwh9xQKsezo4peUjp5BZVQz02DsPcjbFN1AARVDBUfuOxAuJiLrGhgVBbyaZ9RzeqEtItjFEwboCmGDa/2fks4Fdn6mOFGgdsTYPOp32xmEPnomZ6HaDIaTKrZPzcktnptIDyFdhlZ4LwCsE="
+CLOUDFLARE_API_TOKEN="$CLOUDFLARE_TOKEN"

Pipfile

@@ -13,5 +13,6 @@ octodns-cloudflare = "*"
 python_version = "3.12"
 
 [scripts]
+dns-export = "octodns-dump --config-file=octodns-config.yml --output-dir dns" 
 dns-dryrun = "octodns-sync --config-file=./dns/octodns-config.yml"
 dns-apply = "octodns-sync --config-file=./dns/octodns-config.yml --doit"

dns/andreijiroh.dev.yaml

@@ -59,21 +59,6 @@
   ttl: 300
   type: A
   value: 127.0.0.1
-'*.stellapent.tailnet':
-- ttl: 300
-  type: A
-  value: 100.87.227.94
-- ttl: 300
-  type: AAAA
-  value: fd7a:115c:a1e0::a401:e35e
-'*.wplabs':
-  octodns:
-    cloudflare:
-      auto-ttl: true
-      comment: tailnet-only WordPress lab
-  ttl: 300
-  type: CNAME
-  value: wp.stellapent.tailnet.andreijiroh.dev.
 _acme-challenge.api:
   octodns:
     cloudflare:
@@ -252,13 +237,25 @@ status:
   ttl: 300
   type: CNAME
   value: andreijiroh-dev.github.io.
-stellapent.tailnet:
-- ttl: 300
-  type: A
-  value: 100.87.227.94
-- ttl: 300
-  type: AAAA
-  value: fd7a:115c:a1e0::a401:e35e
+tailnet:
+- octodns:
+    cloudflare:
+      auto-ttl: true
+  ttl: 300
+  type: DS
+  value:
+    algorithm: 13
+    digest: CC4238C1416F65932CE32BA56214DE0FD888CBDD042E881ED367EF3BC1C5E52C
+    digest_type: 2
+    key_tag: 64753
+- octodns:
+    cloudflare:
+      auto-ttl: true
+  ttl: 300
+  type: NS
+  values:
+  - ns1.desec.io.
+  - ns2.desec.org.
 tommy2heliohost._domainkey:
   octodns:
     cloudflare:
@@ -305,14 +302,6 @@ wikilab:
   ttl: 300
   type: CNAME
   value: nyc.domcloud.co.
-wplabs:
-  octodns:
-    cloudflare:
-      auto-ttl: true
-      comment: tailnet-only WordPress lab
-  ttl: 300
-  type: CNAME
-  value: wp.stellapent.tailnet.andreijiroh.dev.
 www:
   octodns:
     cloudflare:

dns/andreijiroh.is-a.dev.yaml

@@ -0,0 +1,31 @@
+---
+? ''
+: octodns:
+    cloudflare:
+      auto-ttl: true
+      proxied: true
+  ttl: 300
+  type: ALIAS
+  value: ajhalili2006.pages.dev.
+_discord:
+  octodns:
+    cloudflare:
+      auto-ttl: true
+      comment: Discord domain verification
+  ttl: 300
+  type: TXT
+  value: dh=3e418355487305cc4560b0611ba783271ccc066d
+git.infraops:
+  octodns:
+    cloudflare:
+      auto-ttl: true
+  ttl: 300
+  type: A
+  value: 69.30.249.53
+uptimekuma:
+  octodns:
+    cloudflare:
+      auto-ttl: true
+  ttl: 300
+  type: A
+  value: 69.30.249.53

octodns-config.yml

@@ -13,15 +13,18 @@ zones:
   andreijiroh.dev.:
     sources: [config]
     targets: [cf]
-  andreijiroh.xyz.:
+  andreijiroh.is-a.dev.:
     sources: [config]
     targets: [cf]
+  #andreijiroh.xyz.:
+  #  sources: [config]
+  #  targets: [cf]
   andreijiroh.eu.org.:
     sources: [config]
     targets: [cf]
-  andreijiroh.uk.eu.org.:
-    sources: [config]
-    targets: [cf]
+  #andreijiroh.uk.eu.org.:
+  #  sources: [config]
+  #  targets: [cf]
   andreijiroh.pp.ua.:
     sources: [config]
     targets: [cf]

package.json

@@ -3,6 +3,6 @@
     "tool:dns-records": "./script/dns-records"
   },
   "dependencies": {
-    "@dotenvx/dotenvx": "^1.32.1"
+    "@dotenvx/dotenvx": "^1.34.0"
   }
 }

script/dns-records

@@ -15,9 +15,9 @@ if [[ "$PWD" != "$GIT_ROOT" ]]; then
 fi
 
 if [ -z "${CI}" ]; then
-  dotenvx run -f .env.ci -- deno run -A "$GIT_ROOT/utils/dns-records.ts" "$@"
+  dotenvx run -f "$GIT_ROOT/.env.ci" -- deno run -A "$GIT_ROOT/utils/dns-records.ts" "$@"
 else
-  dotenvx run -f .env -- deno run -A "$GIT_ROOT/utils/dns-records.ts" "$@"
+  dotenvx run -f "$GIT_ROOT/.env" -- deno run -A "$GIT_ROOT/utils/dns-records.ts" "$@"
 fi
 exitcode=$?
 

utils/dns-records.ts

@@ -29,12 +29,7 @@ program.command("import")
     }
     const args = [
       "run",
-      "--", 
-      "octodns-dump",
-      "--config-file",
-      configFile,
-      "--output-dir",
-      dnsRecordsYamlDir
+      "dns-export"
     ]
     args.push(addTrailingDot(domain),`${provider || "cf"}`)
     console.log(`trying to exec ${whereCli} ${args.join(" ")}`)
@@ -76,7 +71,7 @@ program.command("plan")
     if (Deno.env.get("CLOUDFLARE_TOKEN") == undefined) {
       throw new Error("Cloudflare API token missing, maybe forgot to set DOTENV_PRIVATE_KEY?")
     }
-    const args = ["run", "--", "octodns-sync", "--config-file", configFile]
+    const args = ["run", "dns-dryrun"]
     console.log(`trying to exec ${whereCli} ${args.join(" ")}`)
     const ops = new Deno.Command(whereCli, {
       args,
@@ -118,7 +113,7 @@ program.command("apply")
       throw new Error("Cloudflare API token missing, maybe forgot to set DOTENV_PRIVATE_KEY?")
     }
 
-    const args = ["run", "--", "octodns-sync", "--config-file", configFile, "--doit"]
+    const args = ["run", "dns-apply"]
 
     if (opts.forceApply == true) {
       args.push("--force")