;; Nameservers.
:ns #+view/inside ((radius.ns :ip radius)
+ (precision.ns :ip precision)
(vampire.ns :ip vampire))
#-view/inside ((radius.ns :ip radius)
- (vampire.ns :ip vampire)
+ (precision.ns :ip precision)
(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)
+ ((@ mail)
:mx mail
:srv ((:smtp mail)))
-
- ;; Kerberos.
- (_kerberos :txt "DISTORTED.ORG.UK")
- :srv (((:kerberos :protocol :udp) krb)
- ((:kerberos-master :protocol :udp :port 88) krb)
- (:kerberos-adm krb)
- ((:kpasswd :protocol :udp) krb))
-
- ;; Anycast services. (Currently not implemented.)
- (dns0 (unsafe :svc radius.unsafe)
- (any :a dns0.any))
- (dns1 (unsafe :svc vampire.unsafe)
- (any :a dns1.any))
- (ntp0 (unsafe :svc ibanez.unsafe)
- (any :a ntp0.any))
- (ntp1 (unsafe :svc vampire.unsafe)
- (any :a ntp1.any))
- (www-cache (dmz :svc vampire.dmz)
- (unsafe :svc vampire.unsafe)
- (any :a www-cache.any))
+ ((lists bugs cryptomail)
+ :ttl 300
+ :mx mail
+ :srv ((:smtp old-mail)))
+
+ ;; Anycast services.
+ (dns0 (any :a dns0.any)
+ (jump :svc precision.jump)
+ (dmz :svc radius.dmz)
+ (unsafe :svc radius.unsafe)
+ (colo :svc precision.colo))
+ (dns1 (any :a dns1.any)
+ (jump :svc telecaster.jump)
+ (dmz :svc vampire.dmz)
+ (unsafe :svc vampire.unsafe)
+ (colo :svc telecaster.colo))
(dns :cname dns0)
+
+ (ntp0 (any :a ntp0.any)
+ (jump :svc fender.jump)
+ (dmz :svc ibanez.dmz)
+ (unsafe :svc ibanez.unsafe)
+ (colo :svc fender.colo))
+ (ntp1 (any :a ntp1.any)
+ (dmz :svc vampire.dmz)
+ (unsafe :svc vampire.unsafe))
(ntp :cname ntp0)
+
+ (www-cache (any :a www-cache.any)
+ (jump :svc telecaster.jump)
+ (dmz :svc roadstar.dmz)
+ (unsafe :svc roadstar.unsafe)
+ (colo :svc telecaster.colo))
(wpad :cname www-cache)
+ (_kerberos :txt "DISTORTED.ORG.UK")
+ (krb0 (any :a krb0.any)
+ (jump :svc precision.jump)
+ (dmz :svc radius.dmz)
+ (unsafe :svc radius.unsafe)
+ (colo :svc precision.colo))
+ (krb1 (any :a krb1.any)
+ (dmz :svc vampire.dmz)
+ (unsafe :svc vampire.unsafe))
+ (krb-master (unsafe :svc radius.unsafe)
+ (dmz :svc radius.dmz))
+ :srv (((:kerberos :protocol :udp)
+ krb0
+ (krb1 :prio 100))
+ ((:kerberos-master :protocol :udp :port 88) krb-master)
+ (:kerberos-adm krb-master)
+ ((:kpasswd :protocol :udp) krb-master))
+ (krb :cname krb0)
+
;; 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))
- (anon (dmz :a anon.dmz))
+ (guvnor (dmz :a guvnor.dmz))
(gate (dmz :a gate.dmz))
(nat (dmz :a nat.dmz))
(evolution (safe :a evolution.safe))
(evolution :alias evo)
+ ;; Colocated services.
+ ((irc vox) (colo :svc jazz.colo)
+ (jump :svc jazz.jump))
+ ((git www mail) (colo :svc stratocaster.colo)
+ (jump :svc stratocaster.jump))
+ :svc #+view/inside stratocaster.colo
+ #-view/inside stratocaster.jump
+ (cabal :svc stratocaster.colo)
+
;; Local services.
- :svc vampire
- ((www krb ftp rsync wiki git bugs mail db i2p rawk vox)
- :svc vampire)
+ (rawk (unsafe :svc artist.unsafe)
+ (dmz :svc artist.dmz))
+ (pifi (untrusted :cname orange.dhcp)
+ (dmz :svc artist.dmz))
+ ((ftp rsync wiki bugs old-mail db i2p) :svc vampire)
;; Internal services.
#+view/inside ((news lpr) :svc vampire.unsafe)
;; Anonymity services.
- (tor :svc #+view/inside vampire.unsafe
- #-view/inside anon.dmz)
+ (anon (colo :svc jazz.colo)
+ (unsafe :svc vampire.unsafe)
+ (jump :a anon.jump)
+ (dmz :a anon.dmz))
;; Fancy connectivity.
- (iodine (dmz :a iodine.dmz))
+ (iodine (jump :a jazz.jump))
;; Colocated hosts.
(colo :net colo)
(jump :a stratocaster.jump))
(stratocaster :alias strat)
(jazz (colo :a jazz.colo)
- (jump :a jazz.jump))
+ (jump :a jazz.jump)
+ (iodine :a jazz.iodine))
+
+ ;; Media server (on loan to Good Technology HSTG).
+ (jaguar (jump :a jaguar.jump))
+
+ ;; Nicko's server.
+ (richmond (jump :a richmond.jump))
;; Wired ethernet.
(unsafe :net unsafe)
(vampire (unsafe :a vampire.unsafe)
(dmz :a vampire.dmz)
(safe :a vampire.safe)
- (untrusted :a vampire.untrusted)
- (iodine :a vampire.iodine))
+ (untrusted :a vampire.untrusted))
(ibanez (unsafe :a ibanez.unsafe)
(dmz :a ibanez.dmz))
(radius (unsafe :a radius.unsafe)
(jem (unsafe :a jem.unsafe)
(dmz :a jem.dmz))
(artist (unsafe :a artist.unsafe)
- (dmz :a artist.dmz))
+ (dmz :a artist.dmz)
+ (untrusted :a artist.untrusted))
;; DHCP hosts.
(gibson :cname gibson.dhcp)
(vpn :net vpn)
(crybaby (vpn :a crybaby.vpn))
(terror (vpn :a terror.vpn))
+ (orange (vpn :a orange.vpn))
(iodine :net iodine)
;; ITS.
(blackhole (jump :a blackhole.jump))
;; Delegations.
- (dhcp :ns (radius.ns vampire.ns))
+ (dhcp :ns ((radius.ns.dhcp :ip radius)
+ (precision.ns.dhcp :ip precision)
+ (vampire.ns.dhcp :ip vampire)))
+ (dyn :ns ((radius.ns.dyn :ip radius)
+ (precision.ns.dyn :ip precision)
+ (vampire.ns.dyn :ip vampire)))
(dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
+ (precision.ns.dnserr :ip precision.jump)
(vampire.ns.dnserr :ip vampire.dmz)))
- (io :ns ((ns.io :ip iodine.dmz))))
+ (io :ns ((ns.io :ip jazz.jump))))
;;;--------------------------------------------------------------------------
;;; Other subsidiary zones.
(defrevzone trusted
:ns ((radius.ns :ip radius)
+ (precision.ns :ip precision)
(vampire.ns :ip vampire))
:reverse unsafe
:reverse vpn
:reverse colo
:reverse its
:reverse any
- (dhcp :ns (radius.ns vampire.ns))
+ (dhcp :ns ((radius.ns.dhcp :ip radius)
+ (precision.ns.dhcp :ip precision)
+ (vampire.ns.dhcp :ip vampire)))
:cidr-delegation
(trusted ((dhcp safe) 199.29.172.dhcp.199.29.172.in-addr.arpa)))
(defrevzone dmz
:ns ((radius.ns :ip radius)
+ (precision.ns :ip precision)
(vampire.ns :ip vampire))
:reverse dmz)
(defrevzone jump
:ns ((radius.ns :ip radius)
+ (precision.ns :ip precision)
(vampire.ns :ip vampire))
:reverse jump)
(defzone io.distorted.org.uk
- :ns ((ns :ip vampire))
+ :ns ((ns :ip jazz.jump))
(about :txt "Fake zone used for IP-over-DNS tunnelling."))
;;;----- That's all, folks --------------------------------------------------
~mdw / zones / blobdiff