X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/9dc2aec379016124cb0bcd9547ccf3bfb7014a38..ec4898f94336bd47c6339207366913f16209d976:/distorted.lisp?ds=inline diff --git a/distorted.lisp b/distorted.lisp index 9512a33..369e606 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -13,7 +13,7 @@ (setf *default-zone-source* 'radius.distorted.org.uk.) ;;; Main zone definition. (defzone distorted.org.uk - ;; + ;; Nameservers. :ns #+view/inside ((radius.ns :ip radius) (vampire.ns :ip vampire)) @@ -22,35 +22,35 @@ (defzone distorted.org.uk (mythic-beasts-1.ns :ip mythic-ns1) (mythic-beasts-2.ns :ip mythic-ns2) (chiark.ns :ip chiark.greenend.org.uk)) - ;; + ;; Mail servers. ((@ mail lists bugs cryptomail) :mx mail :srv ((:smtp mail))) - ;; + ;; Other services. :srv ((:http www) (:ftp ftp)) - ;; + ;; 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)) - ;; + ;; Wireless gateway. (wireless :net wireless) (evolution (untrusted :a evolution.untrusted)) - ;; + ;; Local services. :svc vampire ((www ftp rsync wiki git bugs mail db tor i2p rawk vox www-cache) :svc vampire) - ;; + ;; Internal services. #+view/inside ((ntp) :svc ibanez.unsafe) #+view/inside ((wpad ntp1 news) :svc vampire.unsafe) - ;; + ;; Wired ethernet. (wired :net wired) (vampire (unsafe :a vampire.unsafe) @@ -69,25 +69,25 @@ (defzone distorted.org.uk (dmz :a jem.dmz)) (artist (unsafe :a artist.unsafe) (dmz :a artist.dmz)) - ;; + ;; DHCP hosts. (gibson :cname gibson.dhcp) (lespaul :cname lespaul.dhcp) (firebird :cname firebird.dhcp) (marauder :cname marauder.dhcp) (invader :cname invader.dhcp) - ;; + ;; Virtual network. (virtual :net virtual) (crybaby (virtual :a crybaby.virtual)) (terror (virtual :a terror.virtual)) (iodine :net iodine) - ;; + ;; 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))))