From 8d261a898a30bc19a4f53da6fbda4a2d34f9676c Mon Sep 17 00:00:00 2001 Message-Id: <8d261a898a30bc19a4f53da6fbda4a2d34f9676c.1713561832.git.mdw@distorted.org.uk> From: Mark Wooding Date: Tue, 15 Apr 2014 17:08:46 +0100 Subject: [PATCH] Move lots of key files into a subdirectory. Organization: Straylight/Edgeware From: Mark Wooding New `zone' will find them, by magic. Also prettify the DKIM stanzas slightly. --- distorted.lisp | 91 +++++++++---------- artist.sshfp => keys/artist.sshfp | 0 crybaby.sshfp => keys/crybaby.sshfp | 0 fender.sshfp => keys/fender.sshfp | 0 gibson.sshfp => keys/gibson.sshfp | 0 ibanez.sshfp => keys/ibanez.sshfp | 0 jazz.sshfp => keys/jazz.sshfp | 0 jem.sshfp => keys/jem.sshfp | 0 orange.sshfp => keys/orange.sshfp | 0 precision.sshfp => keys/precision.sshfp | 0 radius.sshfp => keys/radius.sshfp | 0 roadstar.sshfp => keys/roadstar.sshfp | 0 .../stratocaster-20140403.dkim | 0 stratocaster.sshfp => keys/stratocaster.sshfp | 0 telecaster.sshfp => keys/telecaster.sshfp | 0 terror.sshfp => keys/terror.sshfp | 0 vampire.sshfp => keys/vampire.sshfp | 0 odin.lisp | 7 +- 18 files changed, 46 insertions(+), 52 deletions(-) rename artist.sshfp => keys/artist.sshfp (100%) rename crybaby.sshfp => keys/crybaby.sshfp (100%) rename fender.sshfp => keys/fender.sshfp (100%) rename gibson.sshfp => keys/gibson.sshfp (100%) rename ibanez.sshfp => keys/ibanez.sshfp (100%) rename jazz.sshfp => keys/jazz.sshfp (100%) rename jem.sshfp => keys/jem.sshfp (100%) rename orange.sshfp => keys/orange.sshfp (100%) rename precision.sshfp => keys/precision.sshfp (100%) rename radius.sshfp => keys/radius.sshfp (100%) rename roadstar.sshfp => keys/roadstar.sshfp (100%) rename dkim-stratocaster.20140403.pub => keys/stratocaster-20140403.dkim (100%) rename stratocaster.sshfp => keys/stratocaster.sshfp (100%) rename telecaster.sshfp => keys/telecaster.sshfp (100%) rename terror.sshfp => keys/terror.sshfp (100%) rename vampire.sshfp => keys/vampire.sshfp (100%) diff --git a/distorted.lisp b/distorted.lisp index 1fca34e..354ab9a 100644 --- a/distorted.lisp +++ b/distorted.lisp @@ -34,11 +34,8 @@ (defzone distorted.org.uk :srv ((:smtp old-mail))) (stratocaster.20140403._domainkey - :dkim ("dkim-stratocaster.20140403.pub" - :v "DKIM1" - :k "rsa" - :h "sha256" - :s "email")) + :dkim ("stratocaster-20140403" + :v "DKIM1" :k "rsa" :h "sha256" :s "email")) ;; Anycast services. (dns0 (any :a dns0.any) @@ -105,25 +102,25 @@ (defzone distorted.org.uk (evolution :alias evo) ;; Colocated services. - ((irc vox) (colo :svc jazz.colo :sshfp "jazz.sshfp") - (jump :svc jazz.jump :sshfp "jazz.sshfp")) - ((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster.sshfp") - (jump :svc stratocaster.jump :sshfp "stratocaster.sshfp")) + ((irc vox) (colo :svc jazz.colo :sshfp "jazz") + (jump :svc jazz.jump :sshfp "jazz")) + ((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster") + (jump :svc stratocaster.jump :sshfp "stratocaster")) :svc #+view/inside stratocaster.colo #-view/inside stratocaster.jump - (cabal :svc stratocaster.colo :sshfp "stratocaster.sshfp") - ((db ftp) (colo :svc telecaster.colo :sshfp "telecaster.sshfp") - (jump :svc telecaster.jump :sshfp "telecaster.sshfp")) + (cabal :svc stratocaster.colo :sshfp "stratocaster") + ((db ftp) (colo :svc telecaster.colo :sshfp "telecaster") + (jump :svc telecaster.jump :sshfp "telecaster")) ;; Local services. ((rawk pifi) (unsafe :svc artist.unsafe) (dmz :svc artist.dmz)) - (mirror (dmz :svc roadstar.dmz :sshfp "roadstar.sshfp") - (unsafe :svc roadstar.unsafe :sshfp "roadstar.sshfp")) - ((wiki bugs old-mail i2p) :svc vampire :sshfp "vampire.sshfp") + (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.sshfp") + #+view/inside ((news lpr) :svc vampire.unsafe :sshfp "vampire") ;; Anonymity services. (anon (colo :svc jazz.colo) @@ -137,19 +134,19 @@ (defzone distorted.org.uk ;; Colocated hosts. (colo :net colo) (jump :net jump) - (fender (colo :a fender.colo :sshfp "fender.sshfp") - (jump :a fender.jump :sshfp "fender.sshfp")) - (precision (colo :a precision.colo :sshfp "precision.sshfp") - (jump :a precision.jump :sshfp "precision.sshfp")) - (telecaster (colo :a telecaster.colo :sshfp "telecaster.sshfp") - (jump :a telecaster.jump :sshfp "telecaster.sshfp")) + (fender (colo :a fender.colo :sshfp "fender") + (jump :a fender.jump :sshfp "fender")) + (precision (colo :a precision.colo :sshfp "precision") + (jump :a precision.jump :sshfp "precision")) + (telecaster (colo :a telecaster.colo :sshfp "telecaster") + (jump :a telecaster.jump :sshfp "telecaster")) (telecaster :alias tele) - (stratocaster (colo :a stratocaster.colo :sshfp "stratocaster.sshfp") - (jump :a stratocaster.jump :sshfp "stratocaster.sshfp")) + (stratocaster (colo :a stratocaster.colo :sshfp "stratocaster") + (jump :a stratocaster.jump :sshfp "stratocaster")) (stratocaster :alias strat) - (jazz (colo :a jazz.colo :sshfp "jazz.sshfp") - (jump :a jazz.jump :sshfp "jazz.sshfp") - (iodine :a jazz.iodine :sshfp "jazz.sshfp")) + (jazz (colo :a jazz.colo :sshfp "jazz") + (jump :a jazz.jump :sshfp "jazz") + (iodine :a jazz.iodine :sshfp "jazz")) ;; Media server (on loan to Good Technology HSTG). (jaguar (jump :a jaguar.jump)) @@ -161,23 +158,23 @@ (defzone distorted.org.uk (unsafe :net unsafe) (safe :net safe) (untrusted :net untrusted) - (vampire (unsafe :a vampire.unsafe :sshfp "vampire.sshfp") - (dmz :a vampire.dmz :sshfp "vampire.sshfp") - (safe :a vampire.safe :sshfp "vampire.sshfp") - (untrusted :a vampire.untrusted :sshfp "vampire.sshfp")) - (ibanez (unsafe :a ibanez.unsafe :sshfp "ibanez.sshfp") - (dmz :a ibanez.dmz :sshfp "ibanez.sshfp")) - (radius (unsafe :a radius.unsafe :sshfp "radius.sshfp") - (dmz :a radius.dmz :sshfp "radius.sshfp") - (safe :a radius.safe :sshfp "radius.sshfp") - (untrusted :a radius.untrusted :sshfp "radius.sshfp")) - (roadstar (unsafe :a roadstar.unsafe :sshfp "roadstar.sshfp") - (dmz :a roadstar.dmz :sshfp "roadstar.sshfp")) - (jem (unsafe :a jem.unsafe :sshfp "jem.sshfp") - (dmz :a jem.dmz :sshfp "jem.sshfp")) - (artist (unsafe :a artist.unsafe :sshfp "artist.sshfp") - (dmz :a artist.dmz :sshfp "artist.sshfp") - (untrusted :a artist.untrusted :sshfp "artist.sshfp")) + (vampire (unsafe :a vampire.unsafe :sshfp "vampire") + (dmz :a vampire.dmz :sshfp "vampire") + (safe :a vampire.safe :sshfp "vampire") + (untrusted :a vampire.untrusted :sshfp "vampire")) + (ibanez (unsafe :a ibanez.unsafe :sshfp "ibanez") + (dmz :a ibanez.dmz :sshfp "ibanez")) + (radius (unsafe :a radius.unsafe :sshfp "radius") + (dmz :a radius.dmz :sshfp "radius") + (safe :a radius.safe :sshfp "radius") + (untrusted :a radius.untrusted :sshfp "radius")) + (roadstar (unsafe :a roadstar.unsafe :sshfp "roadstar") + (dmz :a roadstar.dmz :sshfp "roadstar")) + (jem (unsafe :a jem.unsafe :sshfp "jem") + (dmz :a jem.dmz :sshfp "jem")) + (artist (unsafe :a artist.unsafe :sshfp "artist") + (dmz :a artist.dmz :sshfp "artist") + (untrusted :a artist.untrusted :sshfp "artist")) ;; DHCP hosts. (gibson :cname gibson.dhcp) @@ -188,9 +185,9 @@ (defzone distorted.org.uk ;; Virtual network. (vpn :net vpn) - (crybaby (vpn :a crybaby.vpn :sshfp "crybaby.sshfp")) - (terror (vpn :a terror.vpn :sshfp "terror.sshfp")) - (orange (vpn :a orange.vpn :sshfp "orange.sshfp")) + (crybaby (vpn :a crybaby.vpn :sshfp "crybaby")) + (terror (vpn :a terror.vpn :sshfp "terror")) + (orange (vpn :a orange.vpn :sshfp "orange")) (iodine :net iodine) ;; ITS. diff --git a/artist.sshfp b/keys/artist.sshfp similarity index 100% rename from artist.sshfp rename to keys/artist.sshfp diff --git a/crybaby.sshfp b/keys/crybaby.sshfp similarity index 100% rename from crybaby.sshfp rename to keys/crybaby.sshfp diff --git a/fender.sshfp b/keys/fender.sshfp similarity index 100% rename from fender.sshfp rename to keys/fender.sshfp diff --git a/gibson.sshfp b/keys/gibson.sshfp similarity index 100% rename from gibson.sshfp rename to keys/gibson.sshfp diff --git a/ibanez.sshfp b/keys/ibanez.sshfp similarity index 100% rename from ibanez.sshfp rename to keys/ibanez.sshfp diff --git a/jazz.sshfp b/keys/jazz.sshfp similarity index 100% rename from jazz.sshfp rename to keys/jazz.sshfp diff --git a/jem.sshfp b/keys/jem.sshfp similarity index 100% rename from jem.sshfp rename to keys/jem.sshfp diff --git a/orange.sshfp b/keys/orange.sshfp similarity index 100% rename from orange.sshfp rename to keys/orange.sshfp diff --git a/precision.sshfp b/keys/precision.sshfp similarity index 100% rename from precision.sshfp rename to keys/precision.sshfp diff --git a/radius.sshfp b/keys/radius.sshfp similarity index 100% rename from radius.sshfp rename to keys/radius.sshfp diff --git a/roadstar.sshfp b/keys/roadstar.sshfp similarity index 100% rename from roadstar.sshfp rename to keys/roadstar.sshfp diff --git a/dkim-stratocaster.20140403.pub b/keys/stratocaster-20140403.dkim similarity index 100% rename from dkim-stratocaster.20140403.pub rename to keys/stratocaster-20140403.dkim diff --git a/stratocaster.sshfp b/keys/stratocaster.sshfp similarity index 100% rename from stratocaster.sshfp rename to keys/stratocaster.sshfp diff --git a/telecaster.sshfp b/keys/telecaster.sshfp similarity index 100% rename from telecaster.sshfp rename to keys/telecaster.sshfp diff --git a/terror.sshfp b/keys/terror.sshfp similarity index 100% rename from terror.sshfp rename to keys/terror.sshfp diff --git a/vampire.sshfp b/keys/vampire.sshfp similarity index 100% rename from vampire.sshfp rename to keys/vampire.sshfp diff --git a/odin.lisp b/odin.lisp index 45e95cd..b09656f 100644 --- a/odin.lisp +++ b/odin.lisp @@ -21,8 +21,5 @@ (defzone odin.gg :srv ((:smtp mail)) (stratocaster.20140403._domainkey - :dkim ("dkim-stratocaster.20140403.pub" - :v "DKIM1" - :k "rsa" - :h "sha256" - :s "email"))) + :dkim ("stratocaster-20140403" + :v "DKIM1" :k "rsa" :h "sha256" :s "email"))) -- [mdw]