### 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])
;;; (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)
;; 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))
;;
;; 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))
- ((db tor)
+ ((db tor rawk)
(inet :svc guvnor.demon)
(fretwank :svc vampire))
(vox (inet :svc guvnor.demon) (fretwank :svc vampire))
;;
;; 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))
+ (iodine :net iodine)
;;
;; ITS
(its :net its)
(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.