~mdw
/
zones
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
distorted.lisp: Add new records for the bug tracking system.
[zones]
/
distorted.lisp
diff --git
a/distorted.lisp
b/distorted.lisp
index
5bcd7c6
..
ae1c623
100644
(file)
--- a/
distorted.lisp
+++ b/
distorted.lisp
@@
-79,13
+79,9
@@
(chiark.ns :ip chiark.greenend.org.uk))
;; Mail servers.
(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"
(stratocaster.20140403._domainkey
:dkim ("stratocaster-20140403"
@@
-147,6
+143,8
@@
;; Colocated services.
((irc vox keys) (colo :svc jazz.colo :sshfp "jazz")
(jump :svc jazz.jump :sshfp "jazz"))
;; 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
((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster")
(jump :svc stratocaster.jump :sshfp "stratocaster"))
((www @) :tlsa (:https (:service-certificate-constraint
@@
-155,6
+153,8
@@
:certificate :sha-256 #p"distorted-ca")))
(www-cache :tlsa (3127 (:trust-anchor-assertion
:certificate :sha-256 #p"distorted-ca")))
:certificate :sha-256 #p"distorted-ca")))
(www-cache :tlsa (3127 (:trust-anchor-assertion
:certificate :sha-256 #p"distorted-ca")))
+ ((bugs lists) :tlsa (:smtp (:trust-anchor-assertion
+ :certificate :sha-256 #p"distorted-ca")))
(mail :tlsa ((:smtp :submission :imap)
(:trust-anchor-assertion
:certificate :sha-256 #p"distorted-ca")))
(mail :tlsa ((:smtp :submission :imap)
(:trust-anchor-assertion
:certificate :sha-256 #p"distorted-ca")))
@@
-170,7
+170,6
@@
(dmz :svc artist.dmz))
(mirror (dmz :svc roadstar.dmz :sshfp "roadstar")
(unsafe :svc roadstar.unsafe :sshfp "roadstar"))
(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")
;; Internal services.
#+view/inside ((news lpr) :svc vampire.unsafe :sshfp "vampire")
@@
-334,13
+333,17
@@
;;; Other subsidiary zones.
(defzone dhcp.distorted.org.uk
;;; 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)
(crybaby :addr crybaby.unsafe)
(gibson :addr gibson.unsafe)
(crybaby :addr crybaby.unsafe)
- (lespaul :addr lespaul.safe)
- (invader :addr invader.safe)
- (marauder :addr marauder.safe)
+ (lespaul :addr lespaul.unsafe)
+ (gretsch :addr gretsch.unsafe)
(haze :addr haze.unsafe)
(haze :addr haze.unsafe)
- (gretsch :addr gretsch.unsafe))
+ (invader :addr invader.safe)
+ (marauder :addr marauder.safe))
(defzone nicko.org
(richmond :addr richmond.jump))
(defzone nicko.org
(richmond :addr richmond.jump))