(defzone distorted.org.uk
;; Nameservers.
- :ns #+view/inside ((radius.ns :ip radius)
- (precision.ns :ip precision)
- (telecaster.ns :ip telecaster)
- (vampire.ns :ip vampire))
- #-view/inside ((radius.ns :ip radius)
- (precision.ns :ip precision)
- (telecaster.ns :ip telecaster)
- (mythic-beasts-1.ns :ip mythic-ns1)
- (mythic-beasts-2.ns :ip mythic-ns2)
- (chiark.ns :ip chiark.greenend.org.uk))
+ :ns ((radius.ns :ip radius)
+ (precision.ns :ip precision)
+ (telecaster.ns :ip telecaster)
+ (national.ns :ip national)
+ #+view/inside (vampire.ns :ip vampire)
+ #-view/inside (mythic-beasts-1.ns :ip mythic-ns1)
+ #-view/inside (mythic-beasts-2.ns :ip mythic-ns2)
+ #-view/inside (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"
(:ftp ftp))
;; Colocated services.
- ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz")
- (jump :svc jazz.jump :sshfp "jazz"))
+ ((irc vox keys wiki) (colo :svc jazz.colo :sshfp "jazz")
+ (jump :svc jazz.jump :sshfp "jazz"))
+ ((irc vox keys wiki) :tlsa (:https (:service-certificate-constraint
+ :public-key :sha-256 #p"https-jazz")))
+ ((bugs lists db ftp) (colo :svc telecaster.colo :sshfp "telecaster")
+ (jump :svc telecaster.jump :sshfp "telecaster"))
+ ((bugs lists ftp) :tlsa (:https (:service-certificate-constraint
+ :public-key :sha-256
+ #p"https-telecaster")))
+ (dyndns :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")))
+ ((www git mail @) :tlsa (:https (:service-certificate-constraint
+ :public-key :sha-256
+ #p"https-stratocaster")))
+ (www-cache :tlsa (3127 #1=(:trust-anchor-assertion
+ :certificate :sha-256 #p"distorted-ca")))
+ ((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")
- ((db ftp) (colo :svc telecaster.colo :sshfp "telecaster")
- (jump :svc telecaster.jump :sshfp "telecaster"))
- (dyndns :svc telecaster.jump :sshfp "telecaster")
;; Local services.
- ((rawk pifi) (unsafe :svc artist.unsafe)
- (dmz :svc artist.dmz))
+ ((rawk pifi) (unsafe :svc artist.unsafe) (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")
(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"))
(jem :abbrev j (unsafe :abbrev ju) (dmz :abbrev jd))
(jem (unsafe :addr jem.unsafe :sshfp "jem")
(dmz :addr jem.dmz :sshfp "jem"))
+ (universe :abbrev u (unsafe :abbrev uu) (dmz :abbrev ud))
+ (universe (unsafe :addr universe.unsafe :sshfp "universe")
+ (dmz :addr universe.dmz :sshfp "universe"))
(artist :abbrev a
(unsafe :abbrev au) (dmz :abbrev ad) (untrusted :abbrev ax))
(artist (unsafe :addr artist.unsafe :sshfp "artist")
;; Delegations.
(dhcp :ns ((radius.ns.dhcp :ip radius)
+ (vampire.ns.dhcp :ip vampire)
(precision.ns.dhcp :ip precision)
(telecaster.ns.dhcp :ip telecaster)
- (vampire.ns.dhcp :ip vampire)))
+ (national.ns.dhcp :ip national))
+ :ds ((55966 :rsasha256 :sha1
+ "95b05c1f4e84f950f29630004bac447f8a87ca33")
+ (55966 :rsasha256 :sha256
+ #.(concatenate 'string "31696bf54b577362b2eb75793adeb9ec"
+ "2e8440ec671371b35d8d978cd9ca3007"))))
(dyn :ns ((radius.ns.dyn :ip radius)
+ (vampire.ns.dyn :ip vampire)
(precision.ns.dyn :ip precision)
(telecaster.ns.dyn :ip telecaster)
- (vampire.ns.dyn :ip vampire)))
+ (national.ns.dyn :ip national))
+ :ds ((11335 :rsasha256 :sha1
+ "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
+ (11335 :rsasha256 :sha256
+ #.(concatenate 'string "6eb15eb587c48f5b84ca128a656a4cce"
+ "0a41cf040d3d0f15a44dffd6476b2b55"))))
(dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
+ (vampire.ns.dnserr :ip vampire.dmz)
(precision.ns.dnserr :ip precision.jump)
(telecaster.ns.dnserr :ip telecaster)
- (vampire.ns.dnserr :ip vampire.dmz)))
+ (national.ns.dnserr :ip national))
+ :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)
+ (vampire.ns :ip vampire.dmz)
+ (precision.ns :ip precision.jump)
+ (telecaster.ns :ip telecaster.jump)
+ (national.ns :ip national.linode))
(gibson :addr gibson.unsafe)
(crybaby :addr crybaby.unsafe)
- (lespaul :addr lespaul.safe)
+ (lespaul :addr lespaul.unsafe)
+ (gretsch :addr gretsch.unsafe)
+ (haze :addr haze.unsafe)
(invader :addr invader.safe)
(marauder :addr marauder.safe))
(defrevzone trusted
:ns (radius.distorted.org.uk.
+ vampire.distorted.org.uk.
precision.distorted.org.uk.
telecaster.distorted.org.uk.
- vampire.distorted.org.uk.)
+ national.distorted.org.uk.)
:reverse unsafe
:reverse vpn
:reverse colo
:reverse its
:reverse any
(dhcp :ns (radius.distorted.org.uk.
+ vampire.distorted.org.uk.
precision.distorted.org.uk.
telecaster.distorted.org.uk.
- vampire.distorted.org.uk.))
+ national.distorted.org.uk.))
:multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
-(defrevzone (dmz :family :ipv6)
+(defzone dhcp.199.29.172.in-addr.arpa
:ns (radius.distorted.org.uk.
+ vampire.distorted.org.uk.
precision.distorted.org.uk.
telecaster.distorted.org.uk.
- vampire.distorted.org.uk.)
- :reverse dmz)
+ national.distorted.org.uk.))
-(defrevzone (dmz :family :ipv4)
- (144-159 :ns (radius.distorted.org.uk.
- precision.distorted.org.uk.
- telecaster.distorted.org.uk.
- vampire.distorted.org.uk.))
- :multi ((dmz :suffix "144-159") :cname *))
+(defrevzone untrusted
+ :ns (radius.distorted.org.uk.
+ vampire.distorted.org.uk.
+ precision.distorted.org.uk.
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.))
-(defzone 144-159.204.49.62.in-addr.arpa
+(defzone 128-143.238.187.81.in-addr.arpa
:ns (radius.distorted.org.uk.
+ vampire.distorted.org.uk.
precision.distorted.org.uk.
telecaster.distorted.org.uk.
- vampire.distorted.org.uk.)
+ national.distorted.org.uk.
+ secondary-dns.co.uk.)
:reverse ((((:ipv4 dmz)))))
+(defzone 195.113.2.81.in-addr.arpa
+ :ns (radius.distorted.org.uk.
+ vampire.distorted.org.uk.
+ precision.distorted.org.uk.
+ telecaster.distorted.org.uk.
+ national.distorted.org.uk.
+ secondary-dns.co.uk.)
+ :reverse ((((:ipv4 gw)))))
+
(defrevzone (jump :family :ipv6)
:ns (radius.distorted.org.uk.
+ vampire.distorted.org.uk.
precision.distorted.org.uk.
telecaster.distorted.org.uk.
- vampire.distorted.org.uk.)
+ national.distorted.org.uk.)
:reverse jump)
(defrevzone (jump :family :ipv4)
(64-79 :ns (radius.distorted.org.uk.
+ vampire.distorted.org.uk.
precision.distorted.org.uk.
telecaster.distorted.org.uk.
- vampire.distorted.org.uk.))
+ national.distorted.org.uk.))
:multi ((jump :suffix "64-79") :cname *))
(defzone 64-79.198.13.212.in-addr.arpa
:ns (radius.distorted.org.uk.
+ vampire.distorted.org.uk.
precision.distorted.org.uk.
telecaster.distorted.org.uk.
- vampire.distorted.org.uk.)
+ national.distorted.org.uk.)
:reverse ((((:ipv4 jump)))))
-(defrevzone distorted.org.uk-he
+(defrevzone (distorted.org.uk-aaisp :family :ipv6)
:ns (radius.distorted.org.uk.
+ vampire.distorted.org.uk.
precision.distorted.org.uk.
telecaster.distorted.org.uk.
- vampire.distorted.org.uk.)
- :reverse distorted.org.uk-he)
+ national.distorted.org.uk.
+ secondary-dns.co.uk.)
+ :reverse ((((:ipv6 distorted.org.uk-aaisp)))))
(defrevzone distorted.org.uk-jump
:ns (radius.distorted.org.uk.
+ vampire.distorted.org.uk.
precision.distorted.org.uk.
telecaster.distorted.org.uk.
- vampire.distorted.org.uk.)
+ national.distorted.org.uk.)
:reverse distorted.org.uk-jump)
(defzone io.distorted.org.uk
~mdw / zones / blobdiff