distorted.lisp: Add reverse zone for the Jump network.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 8ff1a3a640d39aa07351be1c05f71df5741f29d3..9b6e7987ce75643b25dcf93ea10b32bcedad317f 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -84,14 +84,17 @@ (defzone distorted.org.uk
   ((@ mail blackhole) :mx mail :srv ((:smtp mail)))
   (bugs :mx lists :srv ((:smtp bugs)))
   (lists :mx lists :srv ((:smtp lists)))
   ((@ mail blackhole) :mx mail :srv ((:smtp mail)))
   (bugs :mx lists :srv ((:smtp bugs)))
   (lists :mx lists :srv ((:smtp lists)))

+  (_dmarc :dmarc (:v "DMARC1"
+                 :p "quarantine" :sp "quarantine"
+                 :adkim "s" :aspf "s"))

   ((_domainkey _domainkey.mail) :dname stratocaster.dkim)
   ((stratocaster @ mail) :spf ((:version "spf1")
                               (:pass :ip stratocaster.dmz)
   ((_domainkey _domainkey.mail) :dname stratocaster.dkim)
   ((stratocaster @ mail) :spf ((:version "spf1")
                               (:pass :ip stratocaster.dmz)

-                              (:shrug :all)))
+                              (:soft :all)))

   ((_domainkey.bugs _domainkey.lists) :dname telecaster.dkim)
   ((telecaster bugs lists) :spf ((:version "spf1")
                                 (:pass :ip telecaster.dmz)
   ((_domainkey.bugs _domainkey.lists) :dname telecaster.dkim)
   ((telecaster bugs lists) :spf ((:version "spf1")
                                 (:pass :ip telecaster.dmz)

-                                (:shrug :all)))
+                                (:soft :all)))

 
   ;; Anycast services.
   (dns0 :anycast ((any dns0.any) (dmz radius.dmz)
 
   ;; Anycast services.
   (dns0 :anycast ((any dns0.any) (dmz radius.dmz)


@@ -208,8 +211,9 @@ (defzone distorted.org.uk
 
   ;; Virtual hosts.
   (national :abbrev n (linode :abbrev nl) (upn :abbrev ny))
 
   ;; Virtual hosts.
   (national :abbrev n (linode :abbrev nl) (upn :abbrev ny))

-  (national (linode :addr national.linode)
-           (upn :addr national.upn))
+  (national (linode :addr national.linode) (upn :addr national.upn))
+  (eggle :abbrev e (jump :abbrev ej) (upn :abbrev ey))
+  (eggle (jump :addr eggle.jump) (upn :addr eggle.upn))

   (mdwdev (upn :addr mdwdev.upn))
 
   ;; Nicko's servers.
   (mdwdev (upn :addr mdwdev.upn))
 
   ;; Nicko's servers.


@@ -377,10 +381,10 @@ (defzone distorted.org.uk
 
 #+view/outside
 (defzone dhcp.distorted.org.uk
 
 #+view/outside
 (defzone dhcp.distorted.org.uk

-  :ns ((radius.ns :ip radius.dmz)
-       (precision.ns :ip precision.dmz)
-       (telecaster.ns :ip telecaster.dmz)
-       (national.ns :ip national.linode))
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national))

   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)
   (gibson :addr gibson.unsafe)
   (crybaby :addr crybaby.unsafe)
   (lespaul :addr lespaul.unsafe)


@@ -403,19 +407,19 @@ (defzone nicko.org
 
 #+view/outside
 (defzone stratocaster.dkim.distorted.org.uk
 
 #+view/outside
 (defzone stratocaster.dkim.distorted.org.uk

-  :ns ((radius.ns :ip radius.dmz)
-       (precision.ns :ip precision.dmz)
-       (telecaster.ns :ip telecaster.dmz)
-       (national.ns :ip national.linode)
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national)

        (mythic-beasts-1.ns :ip mythic-ns1)
        (mythic-beasts-2.ns :ip mythic-ns2)
        (mythic-beasts-3.ns :ip mythic-ns3)))
 #+view/outside
 (defzone telecaster.dkim.distorted.org.uk
        (mythic-beasts-1.ns :ip mythic-ns1)
        (mythic-beasts-2.ns :ip mythic-ns2)
        (mythic-beasts-3.ns :ip mythic-ns3)))
 #+view/outside
 (defzone telecaster.dkim.distorted.org.uk

-  :ns ((radius.ns :ip radius.dmz)
-       (precision.ns :ip precision.dmz)
-       (telecaster.ns :ip telecaster.dmz)
-       (national.ns :ip national.linode)
+  :ns ((radius.ns :ip radius)
+       (precision.ns :ip precision)
+       (telecaster.ns :ip telecaster)
+       (national.ns :ip national)

        (mythic-beasts-1.ns :ip mythic-ns1)
        (mythic-beasts-2.ns :ip mythic-ns2)
        (mythic-beasts-3.ns :ip mythic-ns3)))
        (mythic-beasts-1.ns :ip mythic-ns1)
        (mythic-beasts-2.ns :ip mythic-ns2)
        (mythic-beasts-3.ns :ip mythic-ns3)))


@@ -484,6 +488,13 @@ (defrevzone (distorted.org.uk-aaisp :family :ipv6)
                                national.distorted.org.uk.))
   :reverse ((((:ipv6 distorted.org.uk-aaisp)))))
 
                                national.distorted.org.uk.))
   :reverse ((((:ipv6 distorted.org.uk-aaisp)))))
 

+(defrevzone jump-ipv6
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       national.distorted.org.uk.)
+  :reverse ((((:ipv6 jump-ipv6)))))
+

 (defrevzone (dhcp :family :ipv6)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
 (defrevzone (dhcp :family :ipv6)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.