(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))
+ :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 (fretwank :svc metalzone))
- (www-cache (fretwank :svc vampire))
+ ((news ntp) (fretwank :svc metalzone))
+ ((www-cache wpad ntp1) (fretwank :svc vampire))
;;
;; Wired ethernet
(metalzone (inet :a guvnor.demon) (fretwank :a metalzone))
(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) (vampire.ns :ip vampire))
- :reverse trusted)
+ :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) (vampire.ns :ip vampire))
- :reverse untrusted)
+ :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)))