work around GnuPG being silly with redirects

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 96c4ce6..02769fe 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -222,8 +222,17 @@
 </Macro>
 
 <Macro vstatic-vhost-extra-openpgpkey.debian.org>
+       # Legacy GPG versions (including 2.2.12 in buster/Debian 10) get redirections from
+       # the (not supposed to be default) direct method wrong.
+       #  They ask for https://debian.org/.well-known/openpgpkey/hu/<hash>
+       #  get a redirect to https://openpgpkey.debian.org/.well-known/openpgpkey/debian.org/hu/<hash>
+       #  and then try to fetch https://openpgpkey.debian.org/.well-known/openpgpkey/hu/<hash>
+       # *sigh*
+       Alias /.well-known/openpgpkey/hu/ /srv/static.debian.org/mirrors/openpgpkey.debian.org/cur/debian.org/hu/
+       Alias /.well-known/openpgpkey/policy /srv/static.debian.org/mirrors/openpgpkey.debian.org/cur/debian.org/policy
+
+       # The draft specified well-known place using the "advanced method"
        Alias /.well-known/openpgpkey/ /srv/static.debian.org/mirrors/openpgpkey.debian.org/cur/
-
        <Location />
                Options -Indexes
        </Location>