From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 2 Jul 2019 09:15:40 +0000 (+0200)
Subject: disable indexing on openpgpkey (re: #RT7828)
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=683a828a8a8bac00bc66cb41a18191869787a4bd;p=mirror%2Fdsa-puppet.git

disable indexing on openpgpkey (re: #RT7828)
---

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 736cbde73..f10510d89 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,12 @@
 	RewriteRule ^/debconf5/(.*)$ https://debconf5.debconf.org/$1 [R=permanent,L]
 </Macro>
 
+<Macro vstatic-vhost-extra-openpgpkey.debian.org>
+	<Location />
+		Options -Indexes
+	</Location>
+</Macro>
+
 <%=
 
 def vhost(lines, sn, kwargs={})
@@ -273,7 +279,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)
+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)