And make content appear under /.well-known/openpgpkey/ openpgpkey (re: #RT7828)

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

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 8163323..0705d10 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -99,6 +99,7 @@
                        ForceType text/html
                        AddDefaultCharset utf-8
                </Files>
+               AddType text/plain .wml
        </Directory>
 </Macro>
 
@@ -220,6 +221,14 @@
        RewriteRule ^/debconf5/(.*)$ https://debconf5.debconf.org/$1 [R=permanent,L]
 </Macro>
 
+<Macro vstatic-vhost-extra-openpgpkey.debian.org>
+       Alias /.well-known/openpgpkey/ /srv/static.debian.org/mirrors/openpgpkey.debian.org/cur/openpgpkey/
+
+       <Location />
+               Options -Indexes
+       </Location>
+</Macro>
+
 <%=
 
 def vhost(lines, sn, kwargs={})
@@ -267,12 +276,12 @@ vhost(lines, "wnpp-by-tags.debian.net"       , :ssl => true)
 vhost(lines, "security-team.debian.org"      , :ssl => true)
 vhost(lines, "d-i.debian.org"                , :ssl => true)
 vhost(lines, "appstream.debian.org"          , :ssl => true)
-vhost(lines, "apt.buildd.debian.org"         , :ssl => true)
 vhost(lines, "dpl.debian.org"                , :ssl => true)
 vhost(lines, "dsa.debian.org"                , :ssl => true)
 vhost(lines, "rtc.debian.org"                , :ssl => true)
 vhost(lines, "mirror-master.debian.org"      , :ssl => true)
 vhost(lines, "onion.debian.org"              , :ssl => true)
+vhost(lines, "openpgpkey.debian.org"         , :ssl => true, :extra => true)
 vhost(lines, "manpages.debian.org"           , :ssl => true, :extra => true)
 vhost(lines, "cdbuilder-logs.debian.org"     , :ssl => true)