~mdw
/
zones
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keys/*.sshfp: Update to include the new Ed25519 keys.
[zones]
/
distorted.lisp
diff --git
a/distorted.lisp
b/distorted.lisp
index
695c952
..
371b782
100644
(file)
--- a/
distorted.lisp
+++ b/
distorted.lisp
@@
-70,6
+70,7
@@
:ns ((radius.ns :ip radius)
(precision.ns :ip precision)
(telecaster.ns :ip telecaster)
:ns ((radius.ns :ip radius)
(precision.ns :ip precision)
(telecaster.ns :ip telecaster)
+ (national.ns :ip national)
#+view/inside (vampire.ns :ip vampire)
#-view/inside (mythic-beasts-1.ns :ip mythic-ns1)
#-view/inside (mythic-beasts-2.ns :ip mythic-ns2)
#+view/inside (vampire.ns :ip vampire)
#-view/inside (mythic-beasts-1.ns :ip mythic-ns1)
#-view/inside (mythic-beasts-2.ns :ip mythic-ns2)
@@
-306,7
+307,8
@@
(dhcp :ns ((radius.ns.dhcp :ip radius)
(vampire.ns.dhcp :ip vampire)
(precision.ns.dhcp :ip precision)
(dhcp :ns ((radius.ns.dhcp :ip radius)
(vampire.ns.dhcp :ip vampire)
(precision.ns.dhcp :ip precision)
- (telecaster.ns.dhcp :ip telecaster))
+ (telecaster.ns.dhcp :ip telecaster)
+ (national.ns.dhcp :ip national))
:ds ((55966 :rsasha256 :sha1
"95b05c1f4e84f950f29630004bac447f8a87ca33")
(55966 :rsasha256 :sha256
:ds ((55966 :rsasha256 :sha1
"95b05c1f4e84f950f29630004bac447f8a87ca33")
(55966 :rsasha256 :sha256
@@
-315,7
+317,8
@@
(dyn :ns ((radius.ns.dyn :ip radius)
(vampire.ns.dyn :ip vampire)
(precision.ns.dyn :ip precision)
(dyn :ns ((radius.ns.dyn :ip radius)
(vampire.ns.dyn :ip vampire)
(precision.ns.dyn :ip precision)
- (telecaster.ns.dyn :ip telecaster))
+ (telecaster.ns.dyn :ip telecaster)
+ (national.ns.dyn :ip national))
:ds ((11335 :rsasha256 :sha1
"7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
(11335 :rsasha256 :sha256
:ds ((11335 :rsasha256 :sha1
"7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
(11335 :rsasha256 :sha256
@@
-324,7
+327,8
@@
(dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
(vampire.ns.dnserr :ip vampire.dmz)
(precision.ns.dnserr :ip precision.jump)
(dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
(vampire.ns.dnserr :ip vampire.dmz)
(precision.ns.dnserr :ip precision.jump)
- (telecaster.ns.dnserr :ip telecaster))
+ (telecaster.ns.dnserr :ip telecaster.jump)
+ (national.ns.dnserr :ip national.linode))
:ds ((40945 :rsasha256 :sha1
"f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
(40945 :rsasha256 :sha256
:ds ((40945 :rsasha256 :sha1
"f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
(40945 :rsasha256 :sha256
@@
-339,7
+343,8
@@
:ns ((radius.ns :ip radius.dmz)
(vampire.ns :ip vampire.dmz)
(precision.ns :ip precision.jump)
:ns ((radius.ns :ip radius.dmz)
(vampire.ns :ip vampire.dmz)
(precision.ns :ip precision.jump)
- (telecaster.ns :ip telecaster.jump))
+ (telecaster.ns :ip telecaster.jump)
+ (national.ns :ip national.linode))
(gibson :addr gibson.unsafe)
(crybaby :addr crybaby.unsafe)
(lespaul :addr lespaul.unsafe)
(gibson :addr gibson.unsafe)
(crybaby :addr crybaby.unsafe)
(lespaul :addr lespaul.unsafe)
@@
-348,6
+353,13
@@
(invader :addr invader.safe)
(marauder :addr marauder.safe))
(invader :addr invader.safe)
(marauder :addr marauder.safe))
+(defzone dyn.distorted.org.uk
+ :ns ((radius.ns :ip radius)
+ (vampire.ns :ip vampire)
+ (precision.ns :ip precision)
+ (telecaster.ns :ip telecaster)
+ (national.ns :ip national)))
+
(defzone nicko.org
(richmond :addr richmond.jump))
(defzone nicko.org
(richmond :addr richmond.jump))
@@
-355,7
+367,8
@@
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
- telecaster.distorted.org.uk.)
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.)
:reverse unsafe
:reverse vpn
:reverse colo
:reverse unsafe
:reverse vpn
:reverse colo
@@
-364,68
+377,81
@@
(dhcp :ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
(dhcp :ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
- telecaster.distorted.org.uk.))
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.))
:multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
(defzone dhcp.199.29.172.in-addr.arpa
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
:multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
(defzone dhcp.199.29.172.in-addr.arpa
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
- telecaster.distorted.org.uk.))
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.))
(defrevzone untrusted
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
(defrevzone untrusted
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
- telecaster.distorted.org.uk.))
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.))
(defzone 128-143.238.187.81.in-addr.arpa
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
(defzone 128-143.238.187.81.in-addr.arpa
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
- telecaster.distorted.org.uk.)
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.
+ secondary-dns.co.uk.)
:reverse ((((:ipv4 dmz)))))
(defzone 195.113.2.81.in-addr.arpa
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
:reverse ((((:ipv4 dmz)))))
(defzone 195.113.2.81.in-addr.arpa
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
- telecaster.distorted.org.uk.)
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.
+ secondary-dns.co.uk.)
:reverse ((((:ipv4 gw)))))
(defrevzone (jump :family :ipv6)
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
:reverse ((((:ipv4 gw)))))
(defrevzone (jump :family :ipv6)
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
- telecaster.distorted.org.uk.)
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.)
:reverse jump)
(defrevzone (jump :family :ipv4)
(64-79 :ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
:reverse jump)
(defrevzone (jump :family :ipv4)
(64-79 :ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
- telecaster.distorted.org.uk.))
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.))
:multi ((jump :suffix "64-79") :cname *))
(defzone 64-79.198.13.212.in-addr.arpa
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
:multi ((jump :suffix "64-79") :cname *))
(defzone 64-79.198.13.212.in-addr.arpa
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
- telecaster.distorted.org.uk.)
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.)
:reverse ((((:ipv4 jump)))))
(defrevzone (distorted.org.uk-aaisp :family :ipv6)
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
:reverse ((((:ipv4 jump)))))
(defrevzone (distorted.org.uk-aaisp :family :ipv6)
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
- telecaster.distorted.org.uk.)
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.
+ secondary-dns.co.uk.)
:reverse ((((:ipv6 distorted.org.uk-aaisp)))))
(defrevzone distorted.org.uk-jump
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
:reverse ((((:ipv6 distorted.org.uk-aaisp)))))
(defrevzone distorted.org.uk-jump
:ns (radius.distorted.org.uk.
vampire.distorted.org.uk.
precision.distorted.org.uk.
- telecaster.distorted.org.uk.)
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.)
:reverse distorted.org.uk-jump)
(defzone io.distorted.org.uk
:reverse distorted.org.uk-jump)
(defzone io.distorted.org.uk