;;; 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
- (wireless 64))
- (trusted 256
- (fretwank 128
- (unsafe 32)
- (dhcp 32)
- (safe 32))
- (virtual 32)))
-
-;; Host allocations
-(defhost guvnor.demon 80.177.3.76)
-
-(defhost guvnor (unsafe 1))
-(defhost metalzone (unsafe 2))
-(defhost evolution (unsafe 3))
-(defhost vampire (unsafe 4))
-
-(defhost tubescreamer (safe 1))
-(defhost obsidian (safe 2))
-
-(defhost evolution.wireless (wireless 1))
-
-(defhost fuzzface (virtual 1))
-(defhost mz (virtual 2))
+;;;--------------------------------------------------------------------------
+;;; Other definitions.
(setf *default-zone-admin* "hostmaster@distorted.org.uk")
-(preferred-subnet-case
- (fretwank
- (setf *default-zone-source* 'metalzone.distorted.org.uk.)
- (defhost www-frontend metalzone))
- (t
- (setf *default-zone-source* 'guvnor.distorted.org.uk.)
- (defhost www-frontend guvnor.demon)))
+(setf *default-zone-source* 'radius.distorted.org.uk.)
+
+;;;--------------------------------------------------------------------------
+;;; Main zone definition.
(defzone distorted.org.uk
;;
- ;; 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))
+ ;; Nameservers.
+ :ns #+view/inside ((radius.ns :ip radius)
+ (vampire.ns :ip vampire))
+ #-view/inside ((radius.ns :ip radius)
+ (vampire.ns :ip vampire)
+ (mythic-beasts-1.ns :ip mythic-ns1)
+ (mythic-beasts-2.ns :ip mythic-ns2)
+ (chiark.ns :ip chiark.greenend.org.uk))
;;
- ;; Mail servers
+ ;; Mail servers.
((@ mail lists bugs cryptomail)
:mx mail
:srv ((:smtp mail)))
;;
- ;; Other services
+ ;; Other services.
:srv ((:http www)
(:ftp ftp))
;;
- ;; Colocated services
- ;;((www ftp git) (inet :svc boyle.nsict.org) (fretwank :svc metalzone))
+ ;; Entry is via little router box.
+ (dmz :net dmz)
+ (guvnor (inside :svc gate.dmz) (dmz :a guvnor.dmz))
+ (gate (dmz :a gate.dmz))
+ (nat (dmz :a nat.dmz))
;;
- ;; Entry is via little port-forwarding box
- (guvnor (inet :a guvnor.demon) (fretwank :a guvnor))
+ ;; Wireless gateway.
+ (wireless :net wireless)
+ (evolution (untrusted :a evolution.untrusted))
;;
- ;; Wireless gateway
- (evolution (fretwank :a evolution) (wireless :a evolution.wireless))
+ ;; Local services.
+ :svc vampire
+ ((www ftp wiki git bugs mail db tor i2p rawk vox www-cache)
+ :svc vampire)
;;
- ;; Local services
- (@ :svc www-frontend)
- ((www ftp wiki git bugs mail rawk)
- (inet :svc guvnor.demon)
- (fretwank :svc metalzone))
- ((db)
- (inet :svc guvnor.demon)
- (fretwank :svc vampire))
+ ;; Internal services.
+ #+view/inside ((ntp) :svc ibanez.unsafe)
+ #+view/inside ((wpad ntp1 news) :svc vampire.unsafe)
;;
- ;; Internal services
- ((news ntp) (fretwank :svc metalzone))
- ((www-cache wpad ntp1) (fretwank :svc vampire))
+ ;; Wired ethernet.
+ (wired :net wired)
+ (vampire (unsafe :a vampire.unsafe)
+ (dmz :a vampire.dmz)
+ (untrusted :a vampire.untrusted)
+ (iodine :a vampire.iodine))
+ (obsidian (safe :a obsidian.safe))
+ (ibanez (unsafe :a ibanez.unsafe)
+ (dmz :a ibanez.dmz))
+ (radius (unsafe :a radius.unsafe)
+ (dmz :a radius.dmz)
+ (untrusted :a radius.untrusted))
+ (roadstar (unsafe :a roadstar.unsafe)
+ (dmz :a roadstar.dmz))
+ (jem (unsafe :a jem.unsafe)
+ (dmz :a jem.dmz))
+ (artist (unsafe :a artist.unsafe)
+ (dmz :a artist.dmz))
;;
- ;; Wired ethernet
- (metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
- (vampire (fretwank :a vampire))
- (tubescreamer (fretwank :a tubescreamer))
- (obsidian (fretwank :a obsidian))
- (fuzzface (virtual :a fuzzface))
- (mz (virtual :a mz))
+ ;; DHCP hosts.
+ (gibson :cname gibson.dhcp)
+ (lespaul :cname lespaul.dhcp)
+ (firebird :cname firebird.dhcp)
+ (marauder :cname marauder.dhcp)
+ (invader :cname invader.dhcp)
;;
- ;; Delegations
- #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
+ ;; Virtual network.
+ (virtual :net virtual)
+ (crybaby (virtual :a crybaby.virtual))
+ (terror (virtual :a terror.virtual))
+ (iodine :net iodine)
;;
- ;; Networks
- (fretwank :net fretwank)
- (wireless :net wireless)
- (virtual :net virtual))
+ ;; ITS.
+ (its :net its)
+ (gw (its :a gw.its))
+ (mz (its :a mz.its))
+ ;;
+ ;; Delegations.
+ #+view/inside (dhcp :ns (radius.ns vampire.ns))
+ (io :ns ((ns.io :ip vampire))))
+
+;;;--------------------------------------------------------------------------
+;;; Other subsidiary zones.
(defrevzone trusted
- :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
+ :ns ((radius.ns :ip radius)
+ (vampire.ns :ip vampire))
:reverse trusted
- #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
- #+subnet/fretwank (@ :cidr-delegation
- (dhcp
- (dhcp 199.29.172.dhcp.199.29.172.in-addr.arpa))))
+ (dhcp :ns (radius.ns vampire.ns))
+ (@ :cidr-delegation
+ (dhcp (dhcp 199.29.172.dhcp.199.29.172.in-addr.arpa))))
(defrevzone untrusted
- :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
- :reverse untrusted
- #+subnet/fretwank (wireless :ns (metalzone.ns vampire.ns))
- #+subnet/fretwank (@ :cidr-delegation
- (wireless
- (wireless
- 198.29.172.wireless.198.29.172.in-addr.arpa))))
+ :ns ((radius.ns :ip radius)
+ (vampire.ns :ip vampire))
+ :reverse untrusted)
+
+(defrevzone dmz
+ :ns ((radius.ns :ip radius)
+ (vampire.ns :ip vampire))
+ :reverse dmz)
(defzone dhcp.distorted.org.uk
- :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
+ :ns ((radius.ns :ip radius)
+ (vampire.ns :ip vampire))
:net dhcp)
+(defzone io.distorted.org.uk
+ :ns ((ns :ip vampire))
+ (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)))
+ :ns ((radius.ns :ip radius)
+ (vampire.ns :ip vampire)))
-(defzone wireless.198.29.172.in-addr.arpa
- :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
- :reverse ((wireless :bytes 4)))
+;;;----- That's all, folks --------------------------------------------------
~mdw / zones / blobdiff