distorted.lisp: Avoid repeating the tedious details for our internal CA.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 4a4b05a7078c70db8a96091459905cc2be59beb8..0277696709823166ab9d8c68d5e0e2adb01ffa18 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -79,13 +79,9 @@ (defzone distorted.org.uk
                     (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,17 +143,17 @@ (defzone distorted.org.uk
   ;; 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
                          :certificate :sha-256 #p"http-server-www#1")))
   ((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")
   :svc #+view/inside stratocaster.colo
        #-view/inside stratocaster.jump
   (cabal :svc stratocaster.colo :sshfp "stratocaster")


@@ -170,7 +166,6 @@ (defzone distorted.org.uk
               (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")


@@ -211,6 +206,11 @@ (defzone distorted.org.uk
        (vpn :addr jazz.vpn :sshfp "jazz")
        (iodine :addr jazz.iodine :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"))
   ;; Media server (on loan to Good Technology HSTG).
   (jaguar :abbrev jag)
   (jaguar (jump :addr jaguar.jump :sshfp "jaguar"))


@@ -340,11 +340,11 @@ (defzone dhcp.distorted.org.uk
        (vampire.ns :ip vampire.dmz))
   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
        (vampire.ns :ip vampire.dmz))
   (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))