distorted.lisp: Use `:addr' records for hosts.

[zones] / hosts.lisp

diff --git a/hosts.lisp b/hosts.lisp
index d62cc5e..5b90533 100644 (file)
--- a/hosts.lisp
+++ b/hosts.lisp
@@ -10,6 +10,7 @@
 (defhost mccoy.flatline.org.uk 80.74.241.31)
 (defhost mythic-ns1 69.56.173.190)
 (defhost mythic-ns2 93.93.128.67)
 (defhost mccoy.flatline.org.uk 80.74.241.31)
 (defhost mythic-ns1 69.56.173.190)
 (defhost mythic-ns2 93.93.128.67)

+(defhost gandi-ns6 217.70.177.40)

 
 ;;;--------------------------------------------------------------------------
 ;;; Internal addresses.
 
 ;;;--------------------------------------------------------------------------
 ;;; Internal addresses.


@@ -47,7 +48,6 @@
 (defhost artist.dmz (dmz 5))
 (defhost vampire.dmz (dmz 6))
 (defhost ibanez.dmz (dmz 9))
 (defhost artist.dmz (dmz 5))
 (defhost vampire.dmz (dmz 6))
 (defhost ibanez.dmz (dmz 9))

-(defhost iodine.dmz (dmz 11))

 (defhost anon.dmz (dmz 12))
 (defhost gate.dmz (dmz 13))
 (defhost nat.dmz (dmz 14))
 (defhost anon.dmz (dmz 12))
 (defhost gate.dmz (dmz 13))
 (defhost nat.dmz (dmz 14))


@@ -58,6 +58,10 @@
 (defhost telecaster.jump (jump 7))
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))
 (defhost telecaster.jump (jump 7))
 (defhost stratocaster.jump (jump 8))
 (defhost jazz.jump (jump 9))

+(defhost jaguar.jump (jump 11))
+(defhost richmond.jump (jump 12))
+(defhost anon.jump (jump 13))
+(defhost blackhole.jump (jump 14))

 
 ;; Unsafe network.
 (defhost radius.unsafe (unsafe 1))
 
 ;; Unsafe network.
 (defhost radius.unsafe (unsafe 1))


@@ -74,15 +78,16 @@
 
 ;; Wireless network.
 (defhost radius.untrusted (untrusted 1))
 
 ;; Wireless network.
 (defhost radius.untrusted (untrusted 1))

-(defhost evolution.untrusted (untrusted 2))
+(defhost artist.untrusted (untrusted 2))

 (defhost vampire.untrusted (untrusted 3))
 
 ;; Virtual private network.
 (defhost crybaby.vpn (vpn 1))
 (defhost terror.vpn (vpn 2))
 (defhost vampire.untrusted (untrusted 3))
 
 ;; Virtual private network.
 (defhost crybaby.vpn (vpn 1))
 (defhost terror.vpn (vpn 2))

+(defhost orange.vpn (vpn 3))

 
 ;; Iodine network.
 
 ;; Iodine network.

-(defhost vampire.iodine (iodine 1))
+(defhost jazz.iodine (iodine 1))

 
 ;; Special network for ITS.
 ;; It doesn't understand point-to-point links, so we need a little net.
 
 ;; Special network for ITS.
 ;; It doesn't understand point-to-point links, so we need a little net.


@@ -102,6 +107,8 @@
 (defhost ntp0.any (any 2))
 (defhost ntp1.any (any 3))
 (defhost www-cache.any (any 4))
 (defhost ntp0.any (any 2))
 (defhost ntp1.any (any 3))
 (defhost www-cache.any (any 4))

+(defhost krb0.any (any 5))
+(defhost krb1.any (any 6))

 
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.
 
 ;;;--------------------------------------------------------------------------
 ;;; Host switch.


@@ -109,9 +116,13 @@
 (preferred-subnet-case
   ((unsafe colo)
    (defhost radius radius.unsafe)
 (preferred-subnet-case
   ((unsafe colo)
    (defhost radius radius.unsafe)

+   (defhost precision precision.colo)
+   (defhost stratocaster stratocaster.colo)

    (defhost vampire vampire.unsafe))
   (t
    (defhost radius radius.dmz)
    (defhost vampire vampire.unsafe))
   (t
    (defhost radius radius.dmz)

+   (defhost precision precision.jump)
+   (defhost stratocaster stratocaster.jump)

    (defhost vampire vampire.dmz)))
 
 ;;;----- That's all, folks --------------------------------------------------
    (defhost vampire vampire.dmz)))
 
 ;;;----- That's all, folks --------------------------------------------------