From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 31 May 2011 12:29:29 +0000 (+0100)
Subject: Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/zones
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/commitdiff_plain/ee4a4b5e7f7a681d1e661db46dfb0c3974d6c293?hp=-c

Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/zones

* 'master' of metalzone.distorted.org.uk:~mdw/public-git/zones:
  Makefile.m4: Make the LaTeX documnt be optional.
  harlequin.lisp: Use the statically defined address for `guvnor'.
  distorted.lisp, harlequin.lisp: Use explicit filetype for `hosts.lisp'.
---

ee4a4b5e7f7a681d1e661db46dfb0c3974d6c293
diff --combined distorted.lisp
index ed09808,b9bf87b..6291e8b
--- a/distorted.lisp
+++ b/distorted.lisp
@@@ -1,6 -1,6 +1,6 @@@
  ;;; Zone file for distorted.org.uk
  
- (load "hosts" :verbose nil)
+ (load "hosts.lisp" :verbose nil)
  
  ;;;--------------------------------------------------------------------------
  ;;; Network allocations
@@@ -27,16 -27,12 +27,16 @@@
  ;; 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))
@@@ -74,46 -70,47 +74,46 @@@
  
  (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 i2p 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))
@@@ -121,27 -118,19 +121,27 @@@
  	   (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 ((ns.io :ip dns-frontend))))