(chiark.ns :ip chiark.greenend.org.uk))
;; Mail servers.
- ((@ mail blackhole)
- :mx mail
- :srv ((:smtp mail)))
- ((lists bugs cryptomail)
- :ttl 300
- :mx mail
- :srv ((:smtp old-mail)))
+ ((@ mail blackhole) :mx mail :srv ((:smtp mail)))
+ ((bugs) :ttl 300 :mx lists :srv ((:smtp bugs)))
+ ((lists) :ttl 300 :mx lists :srv ((:smtp lists)))
(stratocaster.20140403._domainkey
:dkim ("stratocaster-20140403"
:srv ((:http www)
(:ftp ftp))
- ;; Entry is via little router box.
- (dmz :net dmz)
- (guvnor (dmz :addr guvnor.dmz))
- (nat (dmz :addr nat.dmz))
-
- ;; Wireless gateway.
- (wireless :net wireless)
- (evolution (safe :addr evolution.safe))
- (evolution :alias evo)
-
;; Colocated services.
((irc vox keys) (colo :svc jazz.colo :sshfp "jazz")
(jump :svc jazz.jump :sshfp "jazz"))
+ ((bugs lists) (colo :svc telecaster.colo :sshfp "telecaster")
+ (jump :svc telecaster.jump :sshfp "telecaster"))
((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster")
(jump :svc stratocaster.jump :sshfp "stratocaster"))
((www @) :tlsa (:https (:service-certificate-constraint
:certificate :sha-256 #p"http-server-www#1")))
- (git :tlsa (:https (:trust-anchor-assertion
- :certificate :sha-256 #p"distorted-ca")))
- (www-cache :tlsa (3127 (:trust-anchor-assertion
- :certificate :sha-256 #p"distorted-ca")))
- (mail :tlsa ((:smtp :submission :imap)
- (:trust-anchor-assertion
- :certificate :sha-256 #p"distorted-ca")))
+ ((git mail) :tlsa (:https #1=(:trust-anchor-assertion
+ :certificate :sha-256 #p"distorted-ca")))
+ (www-cache :tlsa (3127 #1#))
+ ((bugs lists) :tlsa (:smtp #1#))
+ (mail :tlsa ((:smtp :submission :imap :imaps) #1#))
:svc #+view/inside stratocaster.colo
#-view/inside stratocaster.jump
(cabal :svc stratocaster.colo :sshfp "stratocaster")
(dmz :svc artist.dmz))
(mirror (dmz :svc roadstar.dmz :sshfp "roadstar")
(unsafe :svc roadstar.unsafe :sshfp "roadstar"))
- ((wiki bugs old-mail i2p) :svc vampire :sshfp "vampire")
;; Internal services.
#+view/inside ((news lpr) :svc vampire.unsafe :sshfp "vampire")
(fender :abbrev f (colo :abbrev fc) (jump :abbrev fj))
(fender (colo :addr fender.colo :sshfp "fender")
(jump :addr fender.jump :sshfp "fender"))
- (precision :abbrev p (colo :abbrev pc) (jump :abbrev pj))
+ (precision :abbrev p (colo :abbrev pc) (jump :abbrev pj) (vpn :abbrev pv))
(precision (colo :addr precision.colo :sshfp "precision")
- (jump :addr precision.jump :sshfp "precision"))
+ (jump :addr precision.jump :sshfp "precision")
+ (vpn :addr precision.vpn :sshfp "precision"))
(telecaster :alias tele :abbrev t
(colo :alias tele.colo :abbrev tc)
(jump :alias tele.jump :abbrev tj))
(jump :alias strat.jump :abbrev sj))
(stratocaster (colo :addr stratocaster.colo :sshfp "stratocaster")
(jump :addr stratocaster.jump :sshfp "stratocaster"))
- (jazz :abbrev z (colo :abbrev zc) (jump :abbrev zj))
+ (jazz :abbrev z (colo :abbrev zc) (jump :abbrev zj) (vpn :abbrev :zv))
(jazz (colo :addr jazz.colo :sshfp "jazz")
(jump :addr jazz.jump :sshfp "jazz")
+ (vpn :addr jazz.vpn :sshfp "jazz")
(iodine :addr jazz.iodine :sshfp "jazz"))
+ ;; Virtual hosts.
+ (national :abbrev n (linode :abbrev nl) (upn :abbrev ny))
+ (national (linode :addr national.linode)
+ (upn :addr national.upn))
+
;; Media server (on loan to Good Technology HSTG).
(jaguar :abbrev jag)
(jaguar (jump :addr jaguar.jump :sshfp "jaguar"))
;; Nicko's server.
(richmond (jump :svc richmond.jump))
+ ;; Entry is via little router box.
+ (dmz :net dmz)
+ (guvnor (dmz :addr guvnor.dmz))
+ (nat (dmz :addr nat.dmz))
+
+ ;; Wireless gateway.
+ (wireless :net wireless)
+ (evolution (safe :addr evolution.safe))
+ (evolution :alias evo)
+
+ ;; Switches.
+ (grigsby :alias tp0)
+ (grigsby (safe :addr grigsby.safe))
+ (carling :alias tp1)
+ (carling (safe :addr carling.safe))
+ (tritan :alias tp2)
+ (tritan (safe :addr tritan.safe))
+
;; Wired ethernet.
(unsafe :net unsafe)
(safe :net safe)
(untrusted :net untrusted)
(vampire :abbrev v
- (unsafe :abbrev vu) (dmz :abbrev vd)
+ (unsafe :abbrev vu) (dmz :abbrev vd) (vpn :abbrev vv)
(safe :abbrev vs) (untrusted :abbrev vx))
(vampire (unsafe :addr vampire.unsafe :sshfp "vampire")
(dmz :addr vampire.dmz :sshfp "vampire")
+ (vpn :addr vampire.vpn :sshfp "vampire")
(safe :addr vampire.safe :sshfp "vampire")
(untrusted :addr vampire.untrusted :sshfp "vampire"))
(ibanez :abbrev i (unsafe :abbrev iu) (dmz :abbrev id))
(ibanez (unsafe :addr ibanez.unsafe :sshfp "ibanez")
(dmz :addr ibanez.dmz :sshfp "ibanez"))
(radius :abbrev r
- (unsafe :abbrev ru) (dmz :abbrev rd)
+ (unsafe :abbrev ru) (dmz :abbrev rd) (vpn :abbrev rv)
(safe :abbrev rs) (untrusted :abbrev rx))
(radius (unsafe :addr radius.unsafe :sshfp "radius")
(dmz :addr radius.dmz :sshfp "radius")
+ (vpn :addr radius.vpn :sshfp "radius")
(safe :addr radius.safe :sshfp "radius")
(untrusted :addr radius.untrusted :sshfp "radius"))
(roadstar :abbrev rg (unsafe :abbrev rgu) (dmz :abbrev rgd))
(artist (unsafe :addr artist.unsafe :sshfp "artist")
(dmz :addr artist.dmz :sshfp "artist")
(untrusted :addr artist.untrusted :sshfp "artist"))
+ (groove :abbrev gr)
+ (groove (unsafe :addr groove.unsafe :sshfp "groove"))
;; DHCP hosts.
(gibson :cname gibson.dhcp :abbrev g)
(orange (vpn :addr orange.vpn :sshfp "orange"))
(haze :abbrev h)
(haze (vpn :addr haze.vpn :sshfp "haze"))
- (groove :abbrev gr)
- (groove (vpn :addr groove.vpn :sshfp "groove"))
(iodine :net iodine)
;; ITS.
(dhcp :ns ((radius.ns.dhcp :ip radius)
(precision.ns.dhcp :ip precision)
(telecaster.ns.dhcp :ip telecaster)
- (vampire.ns.dhcp :ip vampire)))
+ (vampire.ns.dhcp :ip vampire))
+ :ds ((55966 :rsasha256 :sha1
+ "95b05c1f4e84f950f29630004bac447f8a87ca33")
+ (55966 :rsasha256 :sha256
+ #.(concatenate 'string "31696bf54b577362b2eb75793adeb9ec"
+ "2e8440ec671371b35d8d978cd9ca3007"))))
(dyn :ns ((radius.ns.dyn :ip radius)
(precision.ns.dyn :ip precision)
(telecaster.ns.dyn :ip telecaster)
- (vampire.ns.dyn :ip vampire)))
+ (vampire.ns.dyn :ip vampire))
+ :ds ((11335 :rsasha256 :sha1
+ "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
+ (11335 :rsasha256 :sha256
+ #.(concatenate 'string "6eb15eb587c48f5b84ca128a656a4cce"
+ "0a41cf040d3d0f15a44dffd6476b2b55"))))
(dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
(precision.ns.dnserr :ip precision.jump)
(telecaster.ns.dnserr :ip telecaster)
- (vampire.ns.dnserr :ip vampire.dmz)))
+ (vampire.ns.dnserr :ip vampire.dmz))
+ :ds ((40945 :rsasha256 :sha1
+ "f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
+ (40945 :rsasha256 :sha256
+ #.(concatenate 'string "fb171d206d4d64c5a7a6c290ce6e20df"
+ "44f1db7f41e2260f1fe8d7c55d524c11"))))
(io :ns ((ns.io :ip jazz.jump))))
;;;--------------------------------------------------------------------------
;;; Other subsidiary zones.
(defzone dhcp.distorted.org.uk
+ :ns ((radius.ns :ip radius.dmz)
+ (precision.ns :ip precision.jump)
+ (telecaster.ns :ip telecaster.jump)
+ (vampire.ns :ip vampire.dmz))
(gibson :addr gibson.unsafe)
- (lespaul :addr lespaul.safe)
+ (crybaby :addr crybaby.unsafe)
+ (lespaul :addr lespaul.unsafe)
+ (gretsch :addr gretsch.unsafe)
+ (haze :addr haze.unsafe)
(invader :addr invader.safe)
(marauder :addr marauder.safe))
~mdw / zones / blobdiff