aboutsummaryrefslogtreecommitdiffstats
path: root/zones
diff options
context:
space:
mode:
Diffstat (limited to 'zones')
-rw-r--r--zones/0_26.76.23.172.in-addr.arpa.zone19
-rw-r--r--zones/0_26.76.23.172.in-addr.arpa.zone.erb25
-rw-r--r--zones/117.73.187.81.in-addr.arpa.zone15
-rw-r--r--zones/117.73.187.81.in-addr.arpa.zone.erb20
-rw-r--r--zones/160-175.96.2.81.in-addr.arpa.zone20
-rw-r--r--zones/160-175.96.2.81.in-addr.arpa.zone.erb26
-rw-r--r--zones/18.198.in-addr.arpa.zone11
-rw-r--r--zones/18.198.in-addr.arpa.zone.erb21
-rw-r--r--zones/192-207.47.187.81.in-addr.arpa.zone.erb (renamed from zones/192-207.47.187.81.in-addr.arpa.zone)24
-rw-r--r--zones/5.1.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone15
-rw-r--r--zones/5.1.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone.erb21
-rw-r--r--zones/5.b.a.a.0.b.8.0.1.0.0.2.ip6.arpa.zone.erb (renamed from zones/5.b.a.a.0.b.8.0.1.0.0.2.ip6.arpa.zone)24
-rw-r--r--zones/a.4.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone15
-rw-r--r--zones/a.4.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone.erb21
-rw-r--r--zones/b.6.0.0.8.9.0.1.0.0.a.2.ip6.arpa.zone.erb (renamed from zones/b.6.0.0.8.9.0.1.0.0.a.2.ip6.arpa.zone)24
-rw-r--r--zones/b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.zone.erb (renamed from zones/b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.zone)20
-rw-r--r--zones/e.1.0.0.0.8.c.1.6.0.a.2.ip6.arpa.zone13
-rw-r--r--zones/e.1.0.0.0.8.c.1.6.0.a.2.ip6.arpa.zone.erb19
-rw-r--r--zones/le-fay.dn42.zone.erb (renamed from zones/le-fay.dn42.zone)19
-rw-r--r--zones/le-fay.org.uk.zone13
-rw-r--r--zones/le-fay.org.uk.zone.erb19
-rw-r--r--zones/le-fay.org.zone.erb (renamed from zones/le-fay.org.zone)24
-rw-r--r--zones/rt.uk.eu.org.zone15
-rw-r--r--zones/rt.uk.eu.org.zone.erb20
24 files changed, 274 insertions, 189 deletions
diff --git a/zones/0_26.76.23.172.in-addr.arpa.zone b/zones/0_26.76.23.172.in-addr.arpa.zone
deleted file mode 100644
index 45f1c42..0000000
--- a/zones/0_26.76.23.172.in-addr.arpa.zone
+++ /dev/null
@@ -1,19 +0,0 @@
-$TTL 1h
-$ORIGIN 0/26.76.23.172.in-addr.arpa.
-
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
- )
-
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
-
- NS a.ns.le-fay.dn42.
- NS b.ns.le-fay.dn42.
- NS c.ns.le-fay.dn42.
-
-2 PTR rose.lon.uk.ipv4.le-fay.dn42.
-3 PTR yarrow.ipv4.le-fay.dn42.
-4 PTR thyme.lon.uk.ipv4.le-fay.dn42.
-5 PTR uk-jmp-1.ipv4.le-fay.dn42.
-8 PTR uk-aai-1.ipv4.le-fay.dn42.
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
new file mode 100644
index 0000000..3ce62f7
--- /dev/null
+++ b/zones/0_26.76.23.172.in-addr.arpa.zone.erb
@@ -0,0 +1,25 @@
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
+
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
+ )
+
+ NS a.ns.le-fay.dn42.
+ NS b.ns.le-fay.dn42.
+ NS c.ns.le-fay.dn42.
+
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
+
+2 PTR rose.lon.uk.ipv4.le-fay.dn42.
+3 PTR yarrow.ipv4.le-fay.dn42.
+4 PTR thyme.lon.uk.ipv4.le-fay.dn42.
+5 PTR uk-jmp-1.ipv4.le-fay.dn42.
+8 PTR uk-aai-1.ipv4.le-fay.dn42.
diff --git a/zones/117.73.187.81.in-addr.arpa.zone b/zones/117.73.187.81.in-addr.arpa.zone
deleted file mode 100644
index f7feba9..0000000
--- a/zones/117.73.187.81.in-addr.arpa.zone
+++ /dev/null
@@ -1,15 +0,0 @@
-$TTL 1h
-$ORIGIN 117.73.187.81.in-addr.arpa.
-
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
- )
-
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
-
- NS ns1.le-fay.org.
- NS ns2.le-fay.org.
- NS ns3.le-fay.org.
-
-@ PTR ng0.willow.eden.le-fay.org.
diff --git a/zones/117.73.187.81.in-addr.arpa.zone.erb b/zones/117.73.187.81.in-addr.arpa.zone.erb
new file mode 100644
index 0000000..72ab29e
--- /dev/null
+++ b/zones/117.73.187.81.in-addr.arpa.zone.erb
@@ -0,0 +1,20 @@
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
+
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
+ )
+
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
+
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+
+@ PTR ng0.willow.eden.le-fay.org.
diff --git a/zones/160-175.96.2.81.in-addr.arpa.zone b/zones/160-175.96.2.81.in-addr.arpa.zone
deleted file mode 100644
index 4df8c1b..0000000
--- a/zones/160-175.96.2.81.in-addr.arpa.zone
+++ /dev/null
@@ -1,20 +0,0 @@
-$TTL 1h
-$ORIGIN 160-175.96.2.81.in-addr.arpa.
-
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
- )
-
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
-
- NS ns1.le-fay.org.
- NS ns2.le-fay.org.
- NS ns3.le-fay.org.
-
-161 PTR vlan401.core-1.inet.eden.le-fay.org.
-162 PTR hemlock.eden.le-fay.org.
-163 PTR witch.eden.le-fay.org.
-164 PTR turnera.eden.le-fay.org.
-165 PTR ilythia.le-fay.org.
-166 PTR ragweed.le-fay.org.
diff --git a/zones/160-175.96.2.81.in-addr.arpa.zone.erb b/zones/160-175.96.2.81.in-addr.arpa.zone.erb
new file mode 100644
index 0000000..f165edf
--- /dev/null
+++ b/zones/160-175.96.2.81.in-addr.arpa.zone.erb
@@ -0,0 +1,26 @@
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
+
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
+ )
+
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
+
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
+
+161 PTR vlan401.core-1.inet.eden.le-fay.org.
+162 PTR hemlock.eden.le-fay.org.
+163 PTR witch.eden.le-fay.org.
+164 PTR turnera.eden.le-fay.org.
+165 PTR ilythia.le-fay.org.
+166 PTR ragweed.le-fay.org.
diff --git a/zones/18.198.in-addr.arpa.zone b/zones/18.198.in-addr.arpa.zone
deleted file mode 100644
index 6b641db..0000000
--- a/zones/18.198.in-addr.arpa.zone
+++ /dev/null
@@ -1,11 +0,0 @@
-$TTL 1h
-$ORIGIN 18.198.in-addr.arpa.
-
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
- )
-
- NS hemlock.eden.le-fay.org.
-
-1.0 PTR vlan402.core-1.inet.eden.le-fay.org.
diff --git a/zones/18.198.in-addr.arpa.zone.erb b/zones/18.198.in-addr.arpa.zone.erb
new file mode 100644
index 0000000..7f358bd
--- /dev/null
+++ b/zones/18.198.in-addr.arpa.zone.erb
@@ -0,0 +1,21 @@
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
+
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
+ )
+
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
+
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
+
+1.0 PTR vlan402.core-1.inet.eden.le-fay.org.
diff --git a/zones/192-207.47.187.81.in-addr.arpa.zone b/zones/192-207.47.187.81.in-addr.arpa.zone.erb
index b9f37da..029460d 100644
--- a/zones/192-207.47.187.81.in-addr.arpa.zone
+++ b/zones/192-207.47.187.81.in-addr.arpa.zone.erb
@@ -1,16 +1,22 @@
-$TTL 1h
-$ORIGIN 192-207.47.187.81.in-addr.arpa.
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
)
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
- NS ns1.le-fay.org.
- NS ns2.le-fay.org.
- NS ns3.le-fay.org.
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
192 PTR ng0.willow.eden.le-fay.org.
193 PTR nat-out-v4-willow.inet.eden.le-fay.org.
diff --git a/zones/5.1.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone b/zones/5.1.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone
deleted file mode 100644
index 77f367f..0000000
--- a/zones/5.1.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone
+++ /dev/null
@@ -1,15 +0,0 @@
-$TTL 1h
-$ORIGIN 5.1.0.4.8.a.b.0.1.0.0.2.ip6.arpa.
-
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
- )
-
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
-
- NS ns1.le-fay.org.
- NS ns2.le-fay.org.
- NS ns3.le-fay.org.
-
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0 PTR amaranth.le-fay.org.
diff --git a/zones/5.1.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone.erb b/zones/5.1.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone.erb
new file mode 100644
index 0000000..7c042c9
--- /dev/null
+++ b/zones/5.1.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone.erb
@@ -0,0 +1,21 @@
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
+
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
+ )
+
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
+
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
+
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0 PTR amaranth.le-fay.org.
diff --git a/zones/5.b.a.a.0.b.8.0.1.0.0.2.ip6.arpa.zone b/zones/5.b.a.a.0.b.8.0.1.0.0.2.ip6.arpa.zone.erb
index 2442ed3..9e3a04f 100644
--- a/zones/5.b.a.a.0.b.8.0.1.0.0.2.ip6.arpa.zone
+++ b/zones/5.b.a.a.0.b.8.0.1.0.0.2.ip6.arpa.zone.erb
@@ -1,16 +1,22 @@
-$TTL 1h
-$ORIGIN 5.b.a.a.0.b.8.0.1.0.0.2.ip6.arpa.
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
)
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
- NS ns1.le-fay.org.
- NS ns2.le-fay.org.
- NS ns3.le-fay.org.
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.0 PTR ng0.willow.eden.le-fay.org.
0.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0 PTR nat-out-v6-willow.inet.le-fay.org.
diff --git a/zones/a.4.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone b/zones/a.4.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone
deleted file mode 100644
index fccc810..0000000
--- a/zones/a.4.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone
+++ /dev/null
@@ -1,15 +0,0 @@
-$TTL 1h
-$ORIGIN a.4.0.4.8.a.b.0.1.0.0.2.ip6.arpa.
-
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
- )
-
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
-
- NS ns1.le-fay.org.
- NS ns2.le-fay.org.
- NS ns3.le-fay.org.
-
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0 PTR thyme.lon.uk.arpa.le-fay.org.
diff --git a/zones/a.4.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone.erb b/zones/a.4.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone.erb
new file mode 100644
index 0000000..e42b1d9
--- /dev/null
+++ b/zones/a.4.0.4.8.a.b.0.1.0.0.2.ip6.arpa.zone.erb
@@ -0,0 +1,21 @@
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
+
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
+ )
+
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
+
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
+
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0 PTR thyme.lon.uk.arpa.le-fay.org.
diff --git a/zones/b.6.0.0.8.9.0.1.0.0.a.2.ip6.arpa.zone b/zones/b.6.0.0.8.9.0.1.0.0.a.2.ip6.arpa.zone.erb
index 22d6b5d..0225f93 100644
--- a/zones/b.6.0.0.8.9.0.1.0.0.a.2.ip6.arpa.zone
+++ b/zones/b.6.0.0.8.9.0.1.0.0.a.2.ip6.arpa.zone.erb
@@ -1,16 +1,22 @@
-$TTL 1h
-$ORIGIN b.6.0.0.8.9.0.1.0.0.a.2.ip6.arpa.
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
)
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
- NS ns1.le-fay.org.
- NS ns2.le-fay.org.
- NS ns3.le-fay.org.
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 PTR vtnet0.uk-myb-1.le-fay.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 PTR vtnet0.uk-myb-2.le-fay.org.
diff --git a/zones/b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.zone b/zones/b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.zone.erb
index 76794e7..f75dd9d 100644
--- a/zones/b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.zone
+++ b/zones/b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.zone.erb
@@ -1,17 +1,23 @@
-$TTL 1h
-$ORIGIN b.6.0.b.3.8.a.0.b.5.d.f.ip6.arpa.
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
- )
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
+ )
NS a.ns.le-fay.dn42.
NS b.ns.le-fay.dn42.
NS c.ns.le-fay.dn42.
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
+
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.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.3.0 PTR yarrow.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.
diff --git a/zones/e.1.0.0.0.8.c.1.6.0.a.2.ip6.arpa.zone b/zones/e.1.0.0.0.8.c.1.6.0.a.2.ip6.arpa.zone
deleted file mode 100644
index f2091e4..0000000
--- a/zones/e.1.0.0.0.8.c.1.6.0.a.2.ip6.arpa.zone
+++ /dev/null
@@ -1,13 +0,0 @@
-$TTL 1h
-$ORIGIN e.1.0.0.0.8.c.1.6.0.a.2.ip6.arpa.
-
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
- )
-
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
-
- NS ns1.le-fay.org.
- NS ns2.le-fay.org.
- NS ns3.le-fay.org.
diff --git a/zones/e.1.0.0.0.8.c.1.6.0.a.2.ip6.arpa.zone.erb b/zones/e.1.0.0.0.8.c.1.6.0.a.2.ip6.arpa.zone.erb
new file mode 100644
index 0000000..1f60783
--- /dev/null
+++ b/zones/e.1.0.0.0.8.c.1.6.0.a.2.ip6.arpa.zone.erb
@@ -0,0 +1,19 @@
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
+
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
+ )
+
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
+
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
diff --git a/zones/le-fay.dn42.zone b/zones/le-fay.dn42.zone.erb
index 6c7e373..3aa1225 100644
--- a/zones/le-fay.dn42.zone
+++ b/zones/le-fay.dn42.zone.erb
@@ -1,12 +1,14 @@
-$TTL 1h
-$ORIGIN le-fay.dn42.
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.dn42. (
- 1 ; serial
- 1h ; refresh
- 5m ; retry
- 8w ; expire
- 3m ; minimum
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
)
NS a.ns.le-fay.dn42.
@@ -14,7 +16,6 @@ $ORIGIN le-fay.dn42.
NS c.ns.le-fay.dn42.
MX 10 smtp
-
TXT "v=spf1 ip6:fd5b:a83:b06b:10::4 ~all"
; Services
diff --git a/zones/le-fay.org.uk.zone b/zones/le-fay.org.uk.zone
deleted file mode 100644
index d140307..0000000
--- a/zones/le-fay.org.uk.zone
+++ /dev/null
@@ -1,13 +0,0 @@
-$TTL 1h
-$ORIGIN le-fay.org.uk.
-
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
- )
-
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
-
- NS ns1.le-fay.org.
- NS ns2.le-fay.org.
- NS ns3.le-fay.org.
diff --git a/zones/le-fay.org.uk.zone.erb b/zones/le-fay.org.uk.zone.erb
new file mode 100644
index 0000000..1f60783
--- /dev/null
+++ b/zones/le-fay.org.uk.zone.erb
@@ -0,0 +1,19 @@
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
+
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
+ )
+
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
+
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
diff --git a/zones/le-fay.org.zone b/zones/le-fay.org.zone.erb
index 0f4ba70..35b787d 100644
--- a/zones/le-fay.org.zone
+++ b/zones/le-fay.org.zone.erb
@@ -1,17 +1,21 @@
-$TTL 1h
-$ORIGIN le-fay.org.
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
- )
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
+ )
- NS ns1.le-fay.org.
- NS ns2.le-fay.org.
- NS ns3.le-fay.org.
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
TXT "v=spf1 ip4:81.187.47.195 ip6:2001:8b0:aab5:4::9 ip4:185.73.44.74 ip6:2001:ba8:4015:100::2 ~all"
MX 20 fuchsia.eden.le-fay.org.
diff --git a/zones/rt.uk.eu.org.zone b/zones/rt.uk.eu.org.zone
deleted file mode 100644
index 5908774..0000000
--- a/zones/rt.uk.eu.org.zone
+++ /dev/null
@@ -1,15 +0,0 @@
-$TTL 1h
-$ORIGIN rt.uk.eu.org.
-
-@ SOA hemlock.eden.le-fay.org. hostmaster.le-fay.org. (
- 1 1h 5m 8w 3m
- ; serial refresh retry expire minimum
- )
-
- CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
-
- NS ns1.le-fay.org.
- NS ns2.le-fay.org.
- NS ns3.le-fay.org.
-
- MX 10 fuchsia.eden.le-fay.org.
diff --git a/zones/rt.uk.eu.org.zone.erb b/zones/rt.uk.eu.org.zone.erb
new file mode 100644
index 0000000..6eb4a10
--- /dev/null
+++ b/zones/rt.uk.eu.org.zone.erb
@@ -0,0 +1,20 @@
+; vim:set ft=eruby.bindzone sw=8 ts=8 sts=8:
+
+$TTL <%= ttl %>
+$ORIGIN <%= zone %>.
+
+@ SOA <%= soa_mname %> <%= soa_rname %> (
+ <%= soa_serial %>
+ <%= soa_refresh %>
+ <%= soa_retry %>
+ <%= soa_expire %>
+ <%= soa_minimum %>
+ )
+
+<% nameservers.split.each do |ns| %>
+ NS <%= ns %>.
+<% end %>
+
+ CAA 128 issue "letsencrypt.org;validationmethods=dns-01"
+ TXT "v=spf1 -all"
+ MX 10 fuchsia.eden.le-fay.org.