(virtual 32)))
;; Host allocations
-(defhost guvnor (unsafe))
(defhost guvnor.demon 80.177.3.76)
-(defhost metalzone (unsafe))
-(defhost tubescreamer (safe))
-(defhost obsidian (safe))
-(defhost evolution (unsafe))
-(defhost evolution.wireless (wireless))
-(defhost fuzzface (virtual))
-(defhost mz (virtual))
-(if (zone-preferred-subnet-p 'fretwank)
- (defhost www-frontend metalzone)
- (defhost www-frontend guvnor.demon))
+
+(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))
(setf *default-zone-admin* "hostmaster@distorted.org.uk")
-(setf *default-zone-source* 'guvnor.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)))
(defzone distorted.org.uk
;;
;; Nameservers
- :ns ((boyle.ns :ip boyle.nsict.org)
- (chiark.ns :ip chiark.greenend.org.uk)
- (guvnor.ns :ip guvnor.demon))
+ :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 lists bugs cryptomail) :mx mail)
;;
;; Local services
(@ :svc www-frontend)
- ((www ftp git bugs mail rawk)
+ ((www ftp wiki git bugs mail rawk)
(inet :svc guvnor.demon)
(fretwank :svc metalzone))
+ ((db)
+ (inet :svc guvnor.demon)
+ (fretwank :svc vampire))
;;
;; Internal services
- ((news www-cache)
- (fretwank :svc metalzone))
+ ((news ntp) (fretwank :svc metalzone))
+ ((www-cache wpad ntp1) (fretwank :svc vampire))
;;
;; 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))
;;
+ ;; Delegations
+ #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
+ ;;
;; Networks
(fretwank :net fretwank)
- (dhcp :net dhcp)
(wireless :net wireless)
(virtual :net virtual))
(defrevzone trusted
- :ns ((metalzone.ns :ip metalzone))
- :reverse trusted)
+ :ns ((metalzone.ns :ip metalzone) (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))))
+
(defrevzone untrusted
- :ns ((metalzone.ns :ip metalzone))
- :reverse 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))))
+
+(defzone dhcp.distorted.org.uk
+ :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
+ :net dhcp)
+
+(defzone dhcp.199.29.172.in-addr.arpa
+ :ns ((metalzone.ns :ip metalzone) (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)))