diff --git a/scripts/prepare-zones.sh b/scripts/prepare-zones.sh index e2f088a..ddb2b62 100755 --- a/scripts/prepare-zones.sh +++ b/scripts/prepare-zones.sh @@ -32,8 +32,10 @@ TODAY=$(date +%Y%m%d) if [[ -z "${SERIAL:-}" ]]; then # Pull the highest YYYYMMDDNN serial from currently-prepared zones # that starts with today's date. If none, default to NN=01. + # `|| true` so a zero-match grep doesn't trip `set -e`. Empty $highest + # then triggers the "first run of the day" branch below. highest=$(grep -hE '^[[:space:]]+'"${TODAY}"'[0-9]{2}[[:space:]]+;' "$DST_DIR"/*.zone 2>/dev/null \ - | awk '{print $1}' | sort -un | tail -1) + | awk '{print $1}' | sort -un | tail -1 || true) if [[ -n "$highest" ]]; then nn=$((10#${highest:8:2})) next_nn=$((nn + 1)) diff --git a/zones/acrazy.org.zone b/zones/acrazy.org.zone index a24ca1c..6e2d000 100644 --- a/zones/acrazy.org.zone +++ b/zones/acrazy.org.zone @@ -7,8 +7,8 @@ $TTL 3600 300 IN NS ns2.vultr.com 300 IN A 74.91.22.234 or 300 IN A 74.91.22.233 -l 300 IN A 100.79.95.190 -*.l 300 IN A 100.79.95.190 +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net b 300 IN A 108.61.229.209 dootie 300 IN A 108.61.229.209 * 300 IN CNAME acrazy.org diff --git a/zones/copper-springs.online.zone b/zones/copper-springs.online.zone index 7885f69..edb55b9 100644 --- a/zones/copper-springs.online.zone +++ b/zones/copper-springs.online.zone @@ -6,7 +6,7 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 74.91.22.234 -dev 300 IN A 100.79.95.190 +dev 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN CNAME copper-springs.online *.dev 300 IN CNAME dev.copper-springs.online 300 IN MX 10 copper-springs.online diff --git a/zones/demostar.io.zone b/zones/demostar.io.zone index d1bfa79..087143a 100644 --- a/zones/demostar.io.zone +++ b/zones/demostar.io.zone @@ -9,7 +9,7 @@ $TTL 3600 ph 300 IN A 144.202.60.236 or 300 IN A 74.91.22.233 vdo 300 IN A 74.91.22.230 -dev 300 IN A 100.79.95.190 +dev 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN CNAME demostar.io shynet 300 IN CNAME demostar.io oo-sandbox 300 IN CNAME oo.demostar.io diff --git a/zones/flonhoney.com.zone b/zones/flonhoney.com.zone index 161f7e2..e855a84 100644 --- a/zones/flonhoney.com.zone +++ b/zones/flonhoney.com.zone @@ -6,8 +6,8 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 108.61.229.209 -l 300 IN A 100.79.95.190 -*.l 300 IN A 100.79.95.190 +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN CNAME flonhoney.com 300 IN MX 10 mail.supported.systems 300 IN TXT "v=spf1 mx a:mail.supported.systems ~all" diff --git a/zones/homestar.ink.zone b/zones/homestar.ink.zone index e60d988..83c22ff 100644 --- a/zones/homestar.ink.zone +++ b/zones/homestar.ink.zone @@ -6,8 +6,8 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 108.61.229.209 -l 300 IN A 100.79.95.190 -*.l 300 IN A 100.79.95.190 +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net photos.mock-reso 300 IN A 108.61.229.209 * 300 IN CNAME homestar.ink 300 IN MX 10 homestar.ink diff --git a/zones/kg7q.cc.zone b/zones/kg7q.cc.zone index a32f138..0bf0296 100644 --- a/zones/kg7q.cc.zone +++ b/zones/kg7q.cc.zone @@ -6,7 +6,7 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 149.28.126.25 -*.l 300 IN A 100.79.95.190 -l 300 IN A 100.79.95.190 +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN CNAME kg7q.cc 300 IN MX 10 mail.supported.systems \ No newline at end of file diff --git a/zones/malloys.us.zone b/zones/malloys.us.zone index 761ebc6..1634d77 100644 --- a/zones/malloys.us.zone +++ b/zones/malloys.us.zone @@ -6,7 +6,7 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 74.91.22.234 -dev.mary 300 IN A 100.79.95.190 +dev.mary 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN CNAME malloys.us *.dev.mary 300 IN CNAME dev.mary.malloys.us vault 300 IN CNAME idahomuellers.fortiddns.com diff --git a/zones/ourjob.site.zone b/zones/ourjob.site.zone index 391a4fe..6ee44c1 100644 --- a/zones/ourjob.site.zone +++ b/zones/ourjob.site.zone @@ -6,7 +6,7 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 108.61.229.209 -l 300 IN A 100.79.95.190 -*.l 300 IN A 100.79.95.190 +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN CNAME ourjob.site 300 IN MX 10 ourjob.site \ No newline at end of file diff --git a/zones/qubeseptic.com.zone b/zones/qubeseptic.com.zone index 067b487..aa0ef10 100644 --- a/zones/qubeseptic.com.zone +++ b/zones/qubeseptic.com.zone @@ -6,10 +6,10 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 108.61.229.209 -l 300 IN A 100.79.95.190 +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN A 108.61.229.209 autoconfig 600 IN A 66.42.75.247 -*.l 300 IN A 100.79.95.190 +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net tw 300 IN CNAME lsct.ashburn.us1.twilio.com 300 IN MX 10 mail.supported.systems jobs 300 IN MX 10 mail.supported.systems diff --git a/zones/ryanmalloy.com.zone b/zones/ryanmalloy.com.zone index fa88b53..ad61570 100644 --- a/zones/ryanmalloy.com.zone +++ b/zones/ryanmalloy.com.zone @@ -6,8 +6,8 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 108.61.229.209 -l 300 IN A 100.79.95.190 -*.l 300 IN A 100.79.95.190 +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN CNAME ryanmalloy.com 300 IN MX 10 mail.supported.systems 300 IN TXT "v=spf1 mx a:mail.supported.systems ~all" diff --git a/zones/septic.report.zone b/zones/septic.report.zone index e537a48..1171cc4 100644 --- a/zones/septic.report.zone +++ b/zones/septic.report.zone @@ -6,8 +6,8 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 108.61.229.209 -*.l 300 IN A 100.79.95.190 -l 300 IN A 100.79.95.190 +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN CNAME septic.report permits 300 IN CNAME docker-2.supported.systems *.permits 300 IN CNAME permits.septic.report diff --git a/zones/sidejob.pro.zone b/zones/sidejob.pro.zone index 5ef24c8..e12025b 100644 --- a/zones/sidejob.pro.zone +++ b/zones/sidejob.pro.zone @@ -6,8 +6,8 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 108.61.229.209 -*.l 300 IN A 100.79.95.190 -l 300 IN A 100.79.95.190 +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN CNAME sidejob.pro 300 IN MX 10 sidejob.pro _acme-challenge.api 300 IN TXT "a1zkQ7ukvloDCOuB5kCsxC1TWH2rRXKCCI88GJrwV84" diff --git a/zones/supported.systems.zone b/zones/supported.systems.zone index 1be0670..e306fcc 100644 --- a/zones/supported.systems.zone +++ b/zones/supported.systems.zone @@ -67,8 +67,8 @@ ollama-a40ls-1 300 IN A 96.30.196.136 ollama-gh200-1 300 IN A 155.138.192.146 ollama-gh200-2 300 IN A 155.138.229.176 ollama-gh200-3 300 IN A 144.202.23.41 -l 300 IN A 100.79.95.190 -*.l 300 IN A 100.79.95.190 +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net twilio.sip 300 IN A 108.61.229.209 cucm-pub.phones 300 IN A 192.168.1.128 cucm-sub1.phones 300 IN A 192.168.1.129 diff --git a/zones/warehack.ing.zone b/zones/warehack.ing.zone index ba0cc10..afa545c 100644 --- a/zones/warehack.ing.zone +++ b/zones/warehack.ing.zone @@ -6,8 +6,8 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 149.28.126.25 -l 300 IN A 100.79.95.190 -*.l 300 IN A 100.79.95.190 +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN CNAME warehack.ing git 300 IN CNAME idahomuellers.fortiddns.com juliet 300 IN CNAME rpm-bullet.mer.idahomuellers.net diff --git a/zones/zmesh.systems.zone b/zones/zmesh.systems.zone index 40b3a0c..3fd94be 100644 --- a/zones/zmesh.systems.zone +++ b/zones/zmesh.systems.zone @@ -6,8 +6,8 @@ $TTL 3600 300 IN NS ns1.vultr.com 300 IN NS ns2.vultr.com 300 IN A 149.28.126.25 -l 300 IN A 100.79.95.190 -*.l 300 IN A 100.79.95.190 +l 300 IN CNAME rpm-bullet.mer.idahomuellers.net +*.l 300 IN CNAME rpm-bullet.mer.idahomuellers.net * 300 IN CNAME zmesh.systems 300 IN MX 10 zmesh.systems 300 IN MX 5 mail.supported.systems