;;; Zone file for distorted.org.uk
-(load "hosts" :verbose nil)
+(load "hosts.lisp" :verbose nil)
;;;--------------------------------------------------------------------------
;;; Network allocations
;; Unsafe network.
(defhost guvnor (unsafe 1))
(defhost metalzone (unsafe 2))
-;;(defhost evolution.fretwank (unsafe 3))
+(defhost radius (unsafe 3))
(defhost vampire (unsafe 4))
+(defhost roadstar (unsafe 5))
+(defhost jem (unsafe 6))
+(defhost artist (unsafe 7))
;; Safe network.
(defhost tubescreamer (safe 1))
(defhost obsidian (safe 2))
+(defhost ibanez (safe 3))
;; Wireless network.
(defhost vampire.untrusted (untrusted 1))
;; Virtual private network.
(defhost crybaby (virtual 1))
+(defhost terror (virtual 2))
;; Iodine network.
(defhost vampire.iodine (iodine 1))
(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.
(defzone distorted.org.uk
;;
- ;; Nameservers
+ ;; Nameservers.
:ns #+subnet/fretwank ((metalzone.ns :ip metalzone)
(vampire.ns :ip vampire))
#-subnet/fretwank ((boyle.ns :ip boyle.nsict.org)
(chiark.ns :ip chiark.greenend.org.uk)
(guvnor.ns :ip guvnor.demon))
;;
- ;; Mail servers
+ ;; Mail servers.
((@ mail lists bugs cryptomail)
:mx mail
:srv ((:smtp mail)))
;;
- ;; Other services
+ ;; Other services.
:srv ((:http www)
(:ftp ftp))
;;
- ;; Colocated services
+ ;; Colocated services.
;;((www ftp git) (inet :svc boyle.nsict.org) (fretwank :svc metalzone))
;;
- ;; Entry is via little port-forwarding box
+ ;; Entry is via little port-forwarding box.
(guvnor (inet :a guvnor.demon) (fretwank :a guvnor))
;;
- ;; Wireless gateway
+ ;; Wireless gateway.
(untrusted :net untrusted)
(evolution (untrusted :a evolution))
;;
- ;; Local services
+ ;; Local services.
(@ :svc www-frontend)
((www ftp wiki git bugs mail)
(inet :svc guvnor.demon)
(fretwank :svc metalzone))
- ((db tor rawk)
+ ((db tor i2p rawk vox www-cache)
(inet :svc guvnor.demon)
(fretwank :svc vampire))
- (vox (inet :svc guvnor.demon) (fretwank :svc vampire))
;;
- ;; Internal services
+ ;; Internal services.
((ntp1) (fretwank :svc metalzone))
- ((www-cache wpad ntp news) (fretwank :svc vampire))
+ ((wpad ntp news) (fretwank :svc vampire))
;;
- ;; Wired ethernet
+ ;; Wired ethernet.
(fretwank :net fretwank)
(metalzone (inet :a guvnor.demon)
(fretwank :a metalzone))
(untrusted :a vampire.untrusted)
(iodine :a vampire.iodine))
(obsidian (fretwank :a obsidian))
+ (ibanez (fretwank :a ibanez))
+ (radius (fretwank :a radius))
+ (roadstar (fretwank :a roadstar))
+ (jem (fretwank :a jem))
+ (artist (fretwank :a artist))
+ (gibson :cname gibson.dhcp)
+ (lespaul :cname lespaul.dhcp)
+ (firebird :cname firebird.dhcp)
;;
- ;; Virtual network
+ ;; Virtual network.
(virtual :net virtual)
(crybaby (virtual :a crybaby))
+ (terror (virtual :a terror))
(iodine :net iodine)
;;
- ;; ITS
+ ;; ITS.
(its :net its)
(gw (its :a gw))
(mz (its :a mz))
;;
- ;; Delegations
+ ;; Delegations.
#+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.)))
+ (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)))