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 4a4b05a7078c70db8a96091459905cc2be59beb8..c7cc628d0e00bcded4f5d2a85106654b42a200d2 100644 (file)
--- 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 609f6b808e155b13a6d99e369c1ab393fc7cfdf8..671af6a0a0144a095ad15a890f319271e0d7ba41 100644 (file)
--- 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))