From: Mark Wooding Date: Wed, 1 Apr 2015 17:03:32 +0000 (+0100) Subject: distorted.lisp, hosts.lisp: Sort client hosts by subnet. X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/commitdiff_plain/3e38779fc5875973abce9b4e3e43de3f96a3f359 distorted.lisp, hosts.lisp: Sort client hosts by subnet. Makes it a little easier to find the one you're looking for. --- diff --git a/distorted.lisp b/distorted.lisp index 4a4b05a..c7cc628 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -340,11 +340,11 @@ (defzone dhcp.distorted.org.uk (vampire.ns :ip vampire.dmz)) (gibson :addr gibson.unsafe) (crybaby :addr crybaby.unsafe) + (gretsch :addr gretsch.unsafe) + (haze :addr haze.unsafe) (lespaul :addr lespaul.safe) (invader :addr invader.safe) - (marauder :addr marauder.safe) - (haze :addr haze.unsafe) - (gretsch :addr gretsch.unsafe)) + (marauder :addr marauder.safe)) (defzone nicko.org (richmond :addr richmond.jump)) diff --git a/hosts.lisp b/hosts.lisp index 609f6b8..671af6a 100644 --- a/hosts.lisp +++ b/hosts.lisp @@ -90,11 +90,11 @@ (defhost groove.unsafe (unsafe 17)) ;; Client hosts, with IPv6 addresses. (defhost gibson.unsafe ((:ipv6 "2001:470:9740:1:e269:95ff:fe63:bb4"))) (defhost crybaby.unsafe ((:ipv6 "2001:470:9740:1:216:eaff:fec2:4cb8"))) +(defhost haze.unsafe ((:ipv6 "2001:470:9740:1:5056:a8ff:fe01:5654"))) +(defhost gretsch.unsafe ((:ipv6 "2001:470:9740:1:3a2c:4aff:fe6d:e768"))) (defhost lespaul.safe ((:ipv6 "2001:470:9740:4001:a00:27ff:fef5:aaef"))) (defhost invader.safe ((:ipv6 "2001:470:9740:4001:a00:27ff:fe94:a5d7"))) (defhost marauder.safe ((:ipv6 "2001:470:9740:4001:a00:27ff:fe6a:7846"))) -(defhost haze.unsafe ((:ipv6 "2001:470:9740:1:5056:a8ff:fe01:5654"))) -(defhost gretsch.unsafe ((:ipv6 "2001:470:9740:1:3a2c:4aff:fe6d:e768"))) ;; Safe network. (defhost radius.safe (safe 1))