X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=736cbde739cc6081acca4eef37e4a325eb43c36b;hb=535db036c2f77823b4b68efe4989bea51dc212d2;hp=7ae70fb878b25f72960512df24fe7c73fb02a224;hpb=2750ccc51b2913146b9284aaec444f4ced4b65ec;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 7ae70fb87..736cbde73 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>
 
@@ -198,10 +199,26 @@
 	ServerAlias www-test.debconf.org
 
 	<Directory /srv/static.debian.org/mirrors/www.debconf.org/cur>
-		Options +Includes
+		Options +IncludesNOEXEC
+		SSILegacyExprParser on
+		DirectoryIndex index.shtml
 	</Directory>
 
 	AddOutputFilter INCLUDES .shtml
+
+	RewriteEngine On
+	# A few redirects for older debconf sites, so old links work
+	RewriteRule ^/gallery/(.*)$ https://gallery.debconf.org/v/$1 [R=permanent,L]
+	RewriteRule ^/.*years$ https://10years.debconf.org/ [R=permanent,L]
+	RewriteRule ^/debconf2$ https://debconf2.debconf.org/ [R=permanent,L]
+	RewriteRule ^/debconf3$ https://debconf3.debconf.org/ [R=permanent,L]
+	RewriteRule ^/debconf4$ https://debconf4.debconf.org/ [R=permanent,L]
+	RewriteRule ^/debconf5$ https://debconf5.debconf.org/ [R=permanent,L]
+	RewriteRule ^/10years/(.*)$ https://10years.debconf.org/$1 [R=permanent,L]
+	RewriteRule ^/debconf2/(.*)$ https://debconf2.debconf.org/$1 [R=permanent,L]
+	RewriteRule ^/debconf3/(.*)$ https://debconf3.debconf.org/$1 [R=permanent,L]
+	RewriteRule ^/debconf4/(.*)$ https://debconf4.debconf.org/$1 [R=permanent,L]
+	RewriteRule ^/debconf5/(.*)$ https://debconf5.debconf.org/$1 [R=permanent,L]
 </Macro>
 
 <%=
@@ -251,12 +268,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)
 vhost(lines, "manpages.debian.org"           , :ssl => true, :extra => true)
 vhost(lines, "cdbuilder-logs.debian.org"     , :ssl => true)
 
@@ -281,6 +298,7 @@ vhost(lines, "es.debconf.org"                , :ssl => true)
 vhost(lines, "fr.debconf.org"                , :ssl => true)
 vhost(lines, "miniconf10.debconf.org"        , :ssl => true)
 vhost(lines, "wiki.debconf.org"              , :ssl => true, :extra => true)
+vhost(lines, "www.debconf.org"               , :ssl => true, :extra => true)
 
 vhost(lines, "deb.debian.org"                , :extra => true)
 vhost(lines, "release.debian.org"            , :ssl => true, :extra => true)
@@ -389,6 +407,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