aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--zones/0_26.76.23.172.in-addr.arpa.zone.erb2
-rw-r--r--zones/b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.zone.erb32
-rw-r--r--zones/le-fay.dn42.zone.erb48
3 files changed, 37 insertions, 45 deletions
diff --git a/zones/0_26.76.23.172.in-addr.arpa.zone.erb b/zones/0_26.76.23.172.in-addr.arpa.zone.erb
index 2749045..e10886b 100644
--- a/zones/0_26.76.23.172.in-addr.arpa.zone.erb
+++ b/zones/0_26.76.23.172.in-addr.arpa.zone.erb
@@ -18,6 +18,6 @@ $ORIGIN <%= zone %>.
CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
TXT "v=spf1 -all"
-0 PTR dn42-uk-1.ipv4.le-fay.dn42.
+0 PTR ash.ipv4.le-fay.dn42.
2 PTR rose.lon.uk.ipv4.le-fay.dn42.
4 PTR thyme.lon.uk.ipv4.le-fay.dn42.
diff --git a/zones/b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.zone.erb b/zones/b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.zone.erb
index 203459d..08dfb92 100644
--- a/zones/b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.zone.erb
+++ b/zones/b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.zone.erb
@@ -18,26 +18,22 @@ $ORIGIN <%= zone %>.
CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
TXT "v=spf1 -all"
-<%= v6rev('100::1/48') %> PTR dn42-uk-1.le-fay.dn42.
+<%= v6rev('100::1/48') %> PTR ash.le-fay.dn42.
<%= v6rev('200::1/48') %> PTR rose.le-fay.dn42.
<%= v6rev('200::2/48') %> PTR lily.le-fay.dn42.
<%= v6rev('200::3/48') %> PTR nightshade.le-fay.dn42.
-1.0.0.0.2.0.0.0.0.0.0.0.0.0.0.0.4.0.0.0 PTR amaranth.eden.le-fay.dn42.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.4.0 PTR thyme.lon.uk.le-fay.dn42.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.0 PTR uk-aai-1.le-fay.dn42.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.0 PTR willow.eden.le-fay.dn42.
-3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.0 PTR core-1.inet.eden.le-fay.dn42.
-4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.0 PTR nat-out-v6-willow.inet.eden.le-fay.dn42.
-5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.6.0 PTR fuchsia.eden.le-fay.dn42.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.6.0 PTR vlan401.core-1.inet.eden.le-fay.dn42.
-3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.6.0 PTR witch.eden.le-fay.dn42.
-4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.6.0 PTR turnera.eden.le-fay.dn42.
-5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.6.0 PTR hemlock.le-fay.dn42.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.f.f.6.0 PTR ix0-3004.willow.eden.le-fay.dn42.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.f.f.6.0 PTR te1.core-1.inet.eden.le-fay.dn42.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.7.0 PTR rose.lon.uk.le-fay.dn42.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.0 PTR uk-jmp-1.le-fay.dn42.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.0 PTR amaranth.eden.le-fay.dn42.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.f.f PTR resolver.le-fay.dn42.
+<%= v6rev('600::1/48') %> PTR willow.le-fay.dn42.
+<%= v6rev('600::3/48') %> PTR eden-core-1.le-fay.dn42.
+<%= v6rev('600::5/48') %> PTR fuchsia.le-fay.dn42.
+
+<%= v6rev('601::1/48') %> PTR vl401.eden-core-1.le-fay.dn42.
+<%= v6rev('601::3/48') %> PTR witch.le-fay.dn42.
+<%= v6rev('601::4/48') %> PTR turnera.le-fay.dn42.
+<%= v6rev('601::5/48') %> PTR hemlock.le-fay.dn42.
+
+<%= v6rev('6ff::1/48') %> PTR ix0-3004.willow.le-fay.dn42.
+<%= v6rev('6ff::2/48') %> PTR te1.eden-core-1.le-fay.dn42.
+
+<%= v6rev('800::2/48') %> PTR amaranth.le-fay.dn42.
diff --git a/zones/le-fay.dn42.zone.erb b/zones/le-fay.dn42.zone.erb
index 4abf0b3..e5324d5 100644
--- a/zones/le-fay.dn42.zone.erb
+++ b/zones/le-fay.dn42.zone.erb
@@ -37,35 +37,31 @@ b.ntp AAAA fd5b:a83:b06b:601::5
c.ntp AAAA fd5b:a83:b06b:500::1
; willow
-willow.eden AAAA fd5b:a83:b06b:600::2
-ix0-3004.willow.eden AAAA fd5b:a83:b06b:6ff::1
-nat-out-v6-willow.inet.eden AAAA fd5b:a83:b06b:600::4
+willow AAAA fd5b:a83:b06b:600::2
+ix0-3004.willow AAAA fd5b:a83:b06b:6ff::1
; Hosts
-amaranth.eden AAAA fd5b:a83:b06b:800::2
-hemlock AAAA fd5b:a83:b06b:601::5
-turnera.eden AAAA fd5b:a83:b06b:601::4
-fuchsia AAAA fd5b:a83:b06b:600::5
-fuchsia.eden CNAME fuchsia
-witch.eden AAAA fd5b:a83:b06b:601::3
-rose.lon.uk AAAA fd5b:a83:b06b:700::1
-thyme.lon.uk AAAA fd5b:a83:b06b:400::1
-uk-aai-1 AAAA fd5b:a83:b06b:600::1
-uk-jmp-2 CNAME thyme.lon.uk.le-fay.dn42.
-uk-myb-2 CNAME rose.lon.uk.le-fay.dn42.
+amaranth AAAA fd5b:a83:b06b:800::2
+hemlock AAAA fd5b:a83:b06b:601::5
+turnera AAAA fd5b:a83:b06b:601::4
+fuchsia AAAA fd5b:a83:b06b:600::5
+witch AAAA fd5b:a83:b06b:601::3
+rose.lon.uk AAAA fd5b:a83:b06b:700::1
+thyme.lon.uk AAAA fd5b:a83:b06b:400::1
+uk-aai-1 AAAA fd5b:a83:b06b:600::1
+uk-jmp-2 CNAME thyme.lon.uk.le-fay.dn42.
+uk-myb-2 CNAME rose.lon.uk.le-fay.dn42.
+rose AAAA fd5b:a83:b06b:200::1
+lily AAAA fd5b:a83:b06b:200::2
+nightshade AAAA fd5b:a83:b06b:200::3
-dn42-uk-1 AAAA fd5b:a83:b06b:100::1
-dn42-uk-1.ipv4 A 172.23.76.0
+ash AAAA fd5b:a83:b06b:100::1
+ash.ipv4 A 172.23.76.0
-rose AAAA fd5b:a83:b06b:200::1
-lily AAAA fd5b:a83:b06b:200::2
-nightshade AAAA fd5b:a83:b06b:200::3
-
-rose.lon.uk.ipv4 A 172.23.76.2
-thyme.lon.uk.ipv4 A 172.23.76.4
-uk-aai-1.ipv4 A 172.23.76.8
+rose.lon.uk.ipv4 A 172.23.76.2
+thyme.lon.uk.ipv4 A 172.23.76.4
; Network devices
-core-1.inet.eden AAAA fd5b:a83:b06b:600::3
-te1.core-1.inet.eden AAAA fd5b:a83:b06b:6ff::2
-vlan401.core-1.inet.eden AAAA fd5b:a83:b06b:601::1
+eden-core-1 AAAA fd5b:a83:b06b:600::3
+te1.eden-core-1 AAAA fd5b:a83:b06b:6ff::2
+vl401.eden-core-1 AAAA fd5b:a83:b06b:601::1