distorted.lisp: Carve an iodine subnet out of `untrusted'.

diff --git a/Makefile.m4 b/Makefile.m4
index f221ac57fb3a9766ec58512ffb2eae6f5c9db9e3..75c33a56d7edfedefdd0dbd093b16f2054ca8c9a 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -36,7 +36,7 @@ m4_divert(-1)
 ### Domains.
 
 DOMAIN([distorted], [inet, fretwank],
 ### Domains.
 
 DOMAIN([distorted], [inet, fretwank],

-       [distorted.org.uk, dhcp.distorted.org.uk,
+       [distorted.org.uk, io.distorted.org.uk, dhcp.distorted.org.uk,

         198.29.172.in-addr.arpa,
         199.29.172.in-addr.arpa, dhcp.199.29.172.in-addr.arpa])
 DOMAIN([harlequin], [inet, fretwank], [harlequin.org.uk])
         198.29.172.in-addr.arpa,
         199.29.172.in-addr.arpa, dhcp.199.29.172.in-addr.arpa])
 DOMAIN([harlequin], [inet, fretwank], [harlequin.org.uk])

diff --git a/distorted.lisp b/distorted.lisp
index 64ec84219d5d2629f96861cdad4a9b7db366e45b..2dab68a40ea2d03ff96ceeaa3e5d19491d533c59 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -7,7 +7,9 @@ (load "hosts" :verbose nil)
 ;;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
 
 (defnet distorted.org.uk 172.29.198.0/23
 ;;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
 
 (defnet distorted.org.uk 172.29.198.0/23

-  (untrusted 256)
+  (untrusted 256
+    (wireless 128)
+    (iodine 16))

   (trusted 256
     (fretwank 128
       (unsafe 32)
   (trusted 256
     (fretwank 128
       (unsafe 32)


@@ -39,6 +41,9 @@ (defhost evolution (untrusted 2))
 ;; Virtual private network.
 (defhost crybaby (virtual 1))
 
 ;; Virtual private network.
 (defhost crybaby (virtual 1))
 

+;; Iodine network.
+(defhost vampire.iodine (iodine 1))
+

 ;; Special network for ITS.
 ;; It doesn't understand point-to-point links, so we need a little net.
 (defhost gw (its 1))
 ;; Special network for ITS.
 ;; It doesn't understand point-to-point links, so we need a little net.
 (defhost gw (its 1))


@@ -90,10 +95,10 @@ (defzone distorted.org.uk
   ;;
   ;; Local services
   (@ :svc www-frontend)
   ;;
   ;; Local services
   (@ :svc www-frontend)

-  ((www ftp wiki git bugs mail rawk)
+  ((www ftp wiki git bugs mail)

    (inet :svc guvnor.demon)
    (fretwank :svc metalzone))
    (inet :svc guvnor.demon)
    (fretwank :svc metalzone))

-  ((db tor)
+  ((db tor rawk)

    (inet :svc guvnor.demon)
    (fretwank :svc vampire))
   (vox (inet :svc guvnor.demon) (fretwank :svc vampire))
    (inet :svc guvnor.demon)
    (fretwank :svc vampire))
   (vox (inet :svc guvnor.demon) (fretwank :svc vampire))


@@ -104,13 +109,17 @@ (defzone distorted.org.uk
   ;;
   ;; Wired ethernet
   (fretwank :net fretwank)
   ;;
   ;; Wired ethernet
   (fretwank :net fretwank)

-  (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
-  (vampire (fretwank :a vampire) (untrusted :a vampire.untrusted))
+  (metalzone (inet :a guvnor.demon)
+            (fretwank :a metalzone))
+  (vampire (fretwank :a vampire)
+          (untrusted :a vampire.untrusted)
+          (iodine :a vampire.iodine))

   (obsidian (fretwank :a obsidian))
   ;;
   ;; Virtual network
   (virtual :net virtual)
   (crybaby (virtual :a crybaby))
   (obsidian (fretwank :a obsidian))
   ;;
   ;; Virtual network
   (virtual :net virtual)
   (crybaby (virtual :a crybaby))

+  (iodine :net iodine)

   ;;
   ;; ITS
   (its :net its)
   ;;
   ;; ITS
   (its :net its)


@@ -118,7 +127,10 @@ (defzone distorted.org.uk
   (mz (its :a mz))
   ;;
   ;; Delegations
   (mz (its :a mz))
   ;;
   ;; Delegations

-  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns)))
+  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
+  (io :ns #-subnet/fretwank (metalzone.ns.distorted.org.uk.)
+         #+subnet/fretwank (metalzone.ns.distorted.org.uk.
+                            vampire.ns.distorted.org.uk.)))

 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.