;;; Host allocations
;; External addresses.
-(defhost guvnor.dmz ((:ipv4 gw 0) (:ipv6 dmz "::1:1")))
+(defhost guvnor.dmz (gw 0))
(defhost radius.dmz (dmz 1))
(defhost roadstar.dmz (dmz 2))
(defhost jem.dmz (dmz 3))
(defhost lespaul.unsafe ((:ipv6 unsafe "a00:27ff:fef5:aaef")))
(defhost haze.unsafe ((:ipv6 unsafe "5056:a8ff:fe01:5654")))
(defhost gretsch.unsafe ((:ipv6 unsafe "3a2c:4aff:fe6d:e768")))
+(defhost spirit.unsafe ((:ipv6 unsafe "568d:5aff:fed9:18b8")))
(defhost invader.safe ((:ipv6 safe "a00:27ff:fe94:a5d7")))
(defhost marauder.safe ((:ipv6 safe "a00:27ff:fe6a:7846")))
-(defhost spirit.unsafe ((:ipv6 unsafe "568d:5aff:fed9:18b8")))
+(defhost unicorn.safe ((:ipv6 safe "20e:c6ff:fe90:a926")))
;; Safe network.
(defhost radius.safe (safe 1))
(defhost kitkat.safe (safe 7))
(defhost lunch.safe (safe 8))
(defhost burntaxe.safe (safe 9))
-(defhost unicorn.safe (safe 10))
+(defhost unicorn.safe ((:ipv4 safe 10)))
;; Wireless network.
(defhost radius.untrusted (untrusted 1))
(defhost national national.linode)
(defhost eggle eggle.jump)))
-(defhost marshall marshall.dmz)
-(defhost mdwdev mdwdev.upn)
-
;;;----- That's all, folks --------------------------------------------------