From 76a134ee07441d45a59a8f2afde9733bf5ba4f4e Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Fri, 1 Jul 2016 22:26:12 +0100 Subject: [PATCH] distorted.lisp, hosts.lisp: Sort `vampire' in with the other house servers. --- distorted.lisp | 60 +++++++++++++++++++++++++++++----------------------------- hosts.lisp | 8 ++++---- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/distorted.lisp b/distorted.lisp index 5464bdf..695c952 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -304,27 +304,27 @@ ;; Delegations. (dhcp :ns ((radius.ns.dhcp :ip radius) + (vampire.ns.dhcp :ip vampire) (precision.ns.dhcp :ip precision) - (telecaster.ns.dhcp :ip telecaster) - (vampire.ns.dhcp :ip vampire)) + (telecaster.ns.dhcp :ip telecaster)) :ds ((55966 :rsasha256 :sha1 "95b05c1f4e84f950f29630004bac447f8a87ca33") (55966 :rsasha256 :sha256 #.(concatenate 'string "31696bf54b577362b2eb75793adeb9ec" "2e8440ec671371b35d8d978cd9ca3007")))) (dyn :ns ((radius.ns.dyn :ip radius) + (vampire.ns.dyn :ip vampire) (precision.ns.dyn :ip precision) - (telecaster.ns.dyn :ip telecaster) - (vampire.ns.dyn :ip vampire)) + (telecaster.ns.dyn :ip telecaster)) :ds ((11335 :rsasha256 :sha1 "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9") (11335 :rsasha256 :sha256 #.(concatenate 'string "6eb15eb587c48f5b84ca128a656a4cce" "0a41cf040d3d0f15a44dffd6476b2b55")))) (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) - (vampire.ns.dnserr :ip vampire.dmz)) + (telecaster.ns.dnserr :ip telecaster)) :ds ((40945 :rsasha256 :sha1 "f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b") (40945 :rsasha256 :sha256 @@ -337,9 +337,9 @@ (defzone dhcp.distorted.org.uk :ns ((radius.ns :ip radius.dmz) + (vampire.ns :ip vampire.dmz) (precision.ns :ip precision.jump) - (telecaster.ns :ip telecaster.jump) - (vampire.ns :ip vampire.dmz)) + (telecaster.ns :ip telecaster.jump)) (gibson :addr gibson.unsafe) (crybaby :addr crybaby.unsafe) (lespaul :addr lespaul.unsafe) @@ -353,79 +353,79 @@ (defrevzone trusted :ns (radius.distorted.org.uk. + vampire.distorted.org.uk. precision.distorted.org.uk. - telecaster.distorted.org.uk. - vampire.distorted.org.uk.) + telecaster.distorted.org.uk.) :reverse unsafe :reverse vpn :reverse colo :reverse its :reverse any (dhcp :ns (radius.distorted.org.uk. + vampire.distorted.org.uk. precision.distorted.org.uk. - telecaster.distorted.org.uk. - vampire.distorted.org.uk.)) + telecaster.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. - vampire.distorted.org.uk.)) + telecaster.distorted.org.uk.)) (defrevzone untrusted :ns (radius.distorted.org.uk. + vampire.distorted.org.uk. precision.distorted.org.uk. - telecaster.distorted.org.uk. - vampire.distorted.org.uk.)) + telecaster.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. - vampire.distorted.org.uk.) + telecaster.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. - vampire.distorted.org.uk.) + telecaster.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. - vampire.distorted.org.uk.) + telecaster.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. - vampire.distorted.org.uk.)) + telecaster.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. - vampire.distorted.org.uk.) + telecaster.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. - vampire.distorted.org.uk.) + telecaster.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. - vampire.distorted.org.uk.) + telecaster.distorted.org.uk.) :reverse distorted.org.uk-jump) (defzone io.distorted.org.uk diff --git a/hosts.lisp b/hosts.lisp index a969fe8..34c3a88 100644 --- a/hosts.lisp +++ b/hosts.lisp @@ -158,16 +158,16 @@ (preferred-subnet-case ((unsafe colo) (defhost radius radius.unsafe) + (defhost vampire vampire.unsafe) (defhost precision precision.colo) (defhost telecaster telecaster.colo) - (defhost stratocaster stratocaster.colo) - (defhost vampire vampire.unsafe)) + (defhost stratocaster stratocaster.colo)) (t (defhost radius radius.dmz) + (defhost vampire vampire.dmz) (defhost precision precision.jump) (defhost telecaster telecaster.jump) - (defhost stratocaster stratocaster.jump) - (defhost vampire vampire.dmz))) + (defhost stratocaster stratocaster.jump))) (defhost jaguar jaguar.jump) -- 2.11.0