New service names: wiki, db, ntp{,1}, and wpad.

[zones] / distorted.lisp

;;; Zone file for distorted.org.uk

(load "hosts" :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))

(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)))

(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))
  ;;
  ;; Mail servers
  ((@ mail lists bugs cryptomail) :mx mail)
  ;;
  ;; Colocated services
  ;;((www ftp git) (inet :svc boyle.nsict.org) (fretwank :svc metalzone))
  ;;
  ;; Entry is via little port-forwarding box
  (guvnor (inet :a guvnor.demon) (fretwank :a guvnor))
  ;;
  ;; Wireless gateway
  (evolution (fretwank :a evolution) (wireless :a evolution.wireless))
  ;;
  ;; 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
  ((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)
  (wireless :net wireless)
  (virtual :net virtual))

(defrevzone 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) (vampire.ns :ip vampire))
  :reverse untrusted)

(defzone dhcp.distorted.org.uk
  :ns (metalzone.ns.distorted.org.uk.
       vampire.ns.distorted.org.uk.)
  :net dhcp)

(defzone dhcp.199.29.172.in-addr.arpa
  :ns (metalzone.ns.199.29.172.in-addr.arpa.
       vampire.ns.199.29.172.in-addr.arpa.))