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=bac115a2733cc69ec99e53e2cd27709a4bdc5c4f;hpb=81ba6474f335921aa0c3b726e604a5a56269315e;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 bac115a27..0705d1036 100644
--- 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)
 
@@ -406,6 +415,15 @@ Use common-dsa-vhost-https-redirect video.debconf.org
 </VirtualHost>
 <% end -%>
 
+Use common-dsa-vhost-https-redirect debconf.org
+<VirtualHost <%= @vhost_listen_443 %> >
+	ServerName debconf.org
+	ServerAdmin debian-admin@debian.org
+	Use common-debian-service-ssl debconf.org
+	Use common-ssl-HSTS
+	Redirect / https://www.debconf.org/
+</VirtualHost>
+
 # historical sites
 ##################
 # now only redirects remain