X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=0705d1036d0361b31fba9fc57d7ba6141f96d506;hb=ee6478411fcb6c31f718f3586791658defa24f1f;hp=2107a36bd15141725c7ea793ae32b39fcefb8992;hpb=f6a4eb4d0eb7078ffb261191abab23801e12db17;p=mirror%2Fdsa-puppet.git

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 2107a36bd..0705d1036 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -221,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={})
@@ -273,6 +281,7 @@ 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)