From 7c0d176164ee07b13e5c861a95a44c3c7ae6dfe9 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Mon, 27 Jun 2016 10:33:59 +0100 Subject: [PATCH] hosts.lisp, distorted.lisp: Preliminary setup for migration to A&A. --- distorted.lisp | 68 +++++++++++++++++++++++++++++++++++++++++++++++----------- hosts.lisp | 16 ++++++++++++++ 2 files changed, 72 insertions(+), 12 deletions(-) diff --git a/distorted.lisp b/distorted.lisp index 56f19eb..4b17c24 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -91,10 +91,12 @@ (dns0 :anycast ((any dns0.any) (jump precision.jump) (colo precision.colo) + (aaisp radius.aaisp) (dmz radius.dmz) (unsafe radius.unsafe))) (dns1 :anycast ((any dns1.any) (jump telecaster.jump) + (aaisp vampire.aaisp) (dmz vampire.dmz) (unsafe vampire.unsafe) (colo telecaster.colo))) @@ -102,16 +104,19 @@ (ntp0 :anycast ((any ntp0.any) (jump fender.jump) + (aaisp ibanez.aaisp) (dmz ibanez.dmz) (unsafe ibanez.unsafe) (colo fender.colo))) (ntp1 :anycast ((any ntp1.any) + (aaisp vampire.aaisp) (dmz vampire.dmz) (unsafe vampire.unsafe))) (ntp :cname ntp0) (www-cache :anycast ((any www-cache.any) (jump telecaster.jump) + (aaisp roadstar.aaisp) (dmz roadstar.dmz) (unsafe roadstar.unsafe) (colo telecaster.colo))) @@ -120,13 +125,16 @@ (_kerberos :txt "DISTORTED.ORG.UK") (krb0 :anycast ((any krb0.any) (jump precision.jump) + (aaisp radius.aaisp) (dmz radius.dmz) (unsafe radius.unsafe) (colo precision.colo))) (krb1 :anycast ((any krb1.any) + (aaisp vampire.aaisp) (dmz vampire.dmz) (unsafe vampire.unsafe))) (krb-master (unsafe :svc radius.unsafe) + (aaisp :svc radius.aaisp) (dmz :svc radius.dmz)) :srv (((:kerberos :protocol :udp) krb0 @@ -166,8 +174,10 @@ ;; Local services. ((rawk pifi) (unsafe :svc artist.unsafe) + (aaisp :svc artist.aaisp) (dmz :svc artist.dmz)) - (mirror (dmz :svc roadstar.dmz :sshfp "roadstar") + (mirror (aasip :svc roadstar.aaisp :sshfp "roadstar") + (dmz :svc roadstar.dmz :sshfp "roadstar") (unsafe :svc roadstar.unsafe :sshfp "roadstar")) ;; Internal services. @@ -177,6 +187,7 @@ (anon (colo :svc jazz.colo) (unsafe :svc vampire.unsafe) (jump :addr anon.jump) + (aaisp :addr anon.aaisp) (dmz :addr anon.dmz)) ;; Fancy connectivity. @@ -222,9 +233,12 @@ (richmond (jump :svc richmond.jump)) ;; Entry is via little router box. + (aaisp :net aaisp) (dmz :net dmz) - (guvnor (dmz :addr guvnor.dmz)) - (nat (dmz :addr nat.dmz)) + (guvnor (dmz :addr guvnor.dmz) + (aaisp :addr guvnor.aaisp)) + (nat (dmz :addr nat.dmz) + (aaisp :addr nat.aaisp)) ;; Wireless gateway. (wireless :net wireless) @@ -244,36 +258,45 @@ (safe :net safe) (untrusted :net untrusted) (vampire :abbrev v - (unsafe :abbrev vu) (dmz :abbrev vd) (vpn :abbrev vv) - (safe :abbrev vs) (untrusted :abbrev vx)) + (unsafe :abbrev vu) (aaisp :abbrev va) (dmz :abbrev vd) + (vpn :abbrev vv) (safe :abbrev vs) (untrusted :abbrev vx)) (vampire (unsafe :addr vampire.unsafe :sshfp "vampire") + (aaisp :addr vampire.aaisp :sshfp "vampire") (dmz :addr vampire.dmz :sshfp "vampire") (vpn :addr vampire.vpn :sshfp "vampire") (safe :addr vampire.safe :sshfp "vampire") (untrusted :addr vampire.untrusted :sshfp "vampire")) - (ibanez :abbrev i (unsafe :abbrev iu) (dmz :abbrev id)) + (ibanez :abbrev i (unsafe :abbrev iu) (aaisp :abbrev ia) (dmz :abbrev id)) (ibanez (unsafe :addr ibanez.unsafe :sshfp "ibanez") + (aaisp :addr ibanez.aaisp :sshfp "ibanez") (dmz :addr ibanez.dmz :sshfp "ibanez")) (radius :abbrev r - (unsafe :abbrev ru) (dmz :abbrev rd) (vpn :abbrev rv) - (safe :abbrev rs) (untrusted :abbrev rx)) + (unsafe :abbrev ru) (aaisp :abbrev ra) (dmz :abbrev rd) + (vpn :abbrev rv) (safe :abbrev rs) (untrusted :abbrev rx)) (radius (unsafe :addr radius.unsafe :sshfp "radius") + (aaisp :addr radius.aaisp :sshfp "radius") (dmz :addr radius.dmz :sshfp "radius") (vpn :addr radius.vpn :sshfp "radius") (safe :addr radius.safe :sshfp "radius") (untrusted :addr radius.untrusted :sshfp "radius")) - (roadstar :abbrev rg (unsafe :abbrev rgu) (dmz :abbrev rgd)) + (roadstar :abbrev rg (unsafe :abbrev rgu) + (aaisp :abbrev rga) (dmz :abbrev rgd)) (roadstar (unsafe :addr roadstar.unsafe :sshfp "roadstar") + (aaisp :addr roadstar.aaisp :sshfp "roadstar") (dmz :addr roadstar.dmz :sshfp "roadstar")) - (jem :abbrev j (unsafe :abbrev ju) (dmz :abbrev jd)) + (jem :abbrev j (unsafe :abbrev ju) (aaisp :abbrev ja) (dmz :abbrev jd)) (jem (unsafe :addr jem.unsafe :sshfp "jem") + (aaisp :addr jem.aaisp :sshfp "jem") (dmz :addr jem.dmz :sshfp "jem")) - (universe :abbrev u (unsafe :abbrev uu) (dmz :abbrev ud)) + (universe :abbrev u (unsafe :abbrev uu) (aaisp :abbrev ua) (dmz :abbrev ud)) (universe (unsafe :addr universe.unsafe :sshfp "universe") + (aaisp :addr universe.aaisp :sshfp "universe") (dmz :addr universe.dmz :sshfp "universe")) (artist :abbrev a - (unsafe :abbrev au) (dmz :abbrev ad) (untrusted :abbrev ax)) + (unsafe :abbrev au) (aaisp :abbrev aa) (dmz :abbrev ad) + (untrusted :abbrev ax)) (artist (unsafe :addr artist.unsafe :sshfp "artist") + (aaisp :addr artist.aaisp :sshfp "artist") (dmz :addr artist.dmz :sshfp "artist") (untrusted :addr artist.untrusted :sshfp "artist")) (groove :abbrev gr) @@ -392,6 +415,20 @@ vampire.distorted.org.uk.) :reverse ((((:ipv4 dmz))))) +(defzone 128-143.238.187.81.in-addr.arpa + :ns (radius.distorted.org.uk. + precision.distorted.org.uk. + telecaster.distorted.org.uk. + vampire.distorted.org.uk.) + :reverse ((((:ipv4 aaisp))))) + +(defzone 195.113.2.81.in-addr.arpa + :ns (radius.distorted.org.uk. + precision.distorted.org.uk. + telecaster.distorted.org.uk. + vampire.distorted.org.uk.) + :reverse ((((:ipv4 aaisp-gw))))) + (defrevzone (jump :family :ipv6) :ns (radius.distorted.org.uk. precision.distorted.org.uk. @@ -420,6 +457,13 @@ vampire.distorted.org.uk.) :reverse distorted.org.uk-he) +(defrevzone (aaisp :family :ipv6) + :ns (radius.distorted.org.uk. + precision.distorted.org.uk. + telecaster.distorted.org.uk. + vampire.distorted.org.uk.) + :reverse ((((:ipv6 aaisp))))) + (defrevzone distorted.org.uk-jump :ns (radius.distorted.org.uk. precision.distorted.org.uk. diff --git a/hosts.lisp b/hosts.lisp index 8576a0b..c19979f 100644 --- a/hosts.lisp +++ b/hosts.lisp @@ -37,6 +37,11 @@ ;; Externally routable DMZ from Demon. (defnet dmz "62.49.204.144/28") +;; Externally routable DMZ from Andrews and Arnold. +(defnet aaisp-gw "81.2.113.195") +(defnet aaisp "81.187.238.128/28") +(defnet aaisp "2001:8b0:c92/48") + ;; Externally routed colo range. (defnet jump "212.13.198.66/28") (defnet jump "2001:ba8:0:1d9/64") @@ -69,6 +74,17 @@ (defhost anon.dmz (dmz 12)) (defhost nat.dmz ((:ipv4 dmz 14))) +(defhost guvnor.aaisp (aaisp-gw 0)) +(defhost radius.aaisp (aaisp 1)) +(defhost roadstar.aaisp (aaisp 2)) +(defhost jem.aaisp (aaisp 3)) +(defhost artist.aaisp (aaisp 4)) +(defhost vampire.aaisp (aaisp 5)) +(defhost universe.aaisp (aaisp 6)) +(defhost ibanez.aaisp (aaisp 9)) +(defhost anon.aaisp (aaisp 12)) +(defhost nat.aaisp ((:ipv4 aaisp 14))) + ;; Colocated addresses. (defhost gate.jump ((:ipv6 jump 2))) (defhost fender.jump (jump 5)) -- 2.11.0