;;; Zone file for distorted.org.uk
-(load "hosts" :verbose nil)
+(load "hosts.lisp" :verbose nil)
;;;--------------------------------------------------------------------------
;;; Network allocations
;;; (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)
;; Unsafe network.
(defhost guvnor (unsafe 1))
(defhost metalzone (unsafe 2))
-(defhost evolution.fretwank (unsafe 3))
+;;(defhost evolution.fretwank (unsafe 3))
(defhost vampire (unsafe 4))
;; Safe network.
;; Virtual private network.
(defhost crybaby (virtual 1))
+(defhost terror (virtual 2))
+
+;; 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.
(preferred-subnet-case
(fretwank
(setf *default-zone-source* 'vampire.distorted.org.uk.)
- (defhost www-frontend metalzone))
+ (defhost www-frontend metalzone)
+ (defhost dns-frontend vampire))
(t
(setf *default-zone-source* 'guvnor.distorted.org.uk.)
- (defhost www-frontend guvnor.demon)))
+ (defhost www-frontend guvnor.demon)
+ (defhost dns-frontend guvnor.demon)))
;;;--------------------------------------------------------------------------
;;; Main zone definition.
;;
;; Wireless gateway
(untrusted :net untrusted)
- (evolution
- :a evolution
- (untrusted :a evolution)
- (fretwank :a evolution.fretwank))
+ (evolution (untrusted :a evolution))
;;
;; 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)
+ ((db tor i2p rawk)
(inet :svc guvnor.demon)
(fretwank :svc vampire))
(vox (inet :svc guvnor.demon) (fretwank :svc vampire))
;;
;; Internal services
- ((news ntp) (fretwank :svc metalzone))
- ((www-cache wpad ntp1) (fretwank :svc vampire))
+ ((ntp1) (fretwank :svc metalzone))
+ ((www-cache wpad ntp news) (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))
+ (terror (virtual :a terror))
+ (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 ((ns.io :ip dns-frontend))))
;;;--------------------------------------------------------------------------
;;; Other subsidiary zones.
:ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
:net dhcp)
+(defzone io.distorted.org.uk
+ :ns ((ns :ip dns-frontend))
+ (about :txt "Fake zone used for IP-over-DNS tunnelling."))
+
(defzone dhcp.199.29.172.in-addr.arpa
:ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire)))