X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=57dc7be1227ac9fc89e11887aeb5ff52826a9484;hb=26bc980392c5213fd04962602529c04493f8dcb7;hp=3bbdaba6cea1b8fe549d60557ea77e4cf00fee91;hpb=b0c6b4af1ac5c354dfe135fa2089b0019ccdbd30;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 3bbdaba6c..57dc7be12 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -6,16 +6,43 @@ Use common-static-vhost incoming.debian.org
 Use common-static-vhost news.debian.net
 Use common-static-vhost debaday.debian.net
 Use common-static-vhost debdeltas.debian.net
-Use common-static-vhost-with-extra metadata.ftp-master.debian.org "AddDefaultCharset utf-8"
+Use common-static-vhost timeline.debian.net
 Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debian.org"
 Use common-static-vhost-with-extra network-test.debian.org "ServerAlias network-test-backend.debian.org"
 Use common-static-vhost-with-extra blends.debian.org "ServerAlias blends-backend.debian.org"
 Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-tags-backend.debian.org"
-Use common-static-vhost     appstream.debian.org
+Use common-static-vhost-ssl appstream.debian.org
 Use common-static-vhost-ssl dsa.debian.org
 Use common-static-vhost-ssl rtc.debian.org
 Use common-static-vhost-with-extra security-team.debian.org "ServerAlias security-team-backend.debian.org"
+Use common-static-vhost 10years.debconf.org
+Use common-static-vhost debconf0.debconf.org
+Use common-static-vhost debconf1.debconf.org
+Use common-static-vhost debconf2.debconf.org
+Use common-static-vhost debconf3.debconf.org
+Use common-static-vhost debconf4.debconf.org
+Use common-static-vhost debconf5.debconf.org
+Use common-static-vhost debconf6.debconf.org
+Use common-static-vhost debconf7.debconf.org
+Use common-static-vhost es.debconf.org
+Use common-static-vhost fr.debconf.org
+Use common-static-vhost miniconf10.debconf.org
+Use common-static-vhost deb.debian.org
+
+# metadata.ftp-master.debian.org
+<VirtualHost <%= vhost_listen %> >
+	ServerName metadata.ftp-master.debian.org
+	ServerAdmin debian-admin@lists.debian.org
 
+	ErrorLog /var/log/apache2/metadata.ftp-master.debian.org-error.log
+	CustomLog /var/log/apache2/metadata.ftp-master.debian.org-access.log privacy
+
+	Use common-static-base metadata.ftp-master.debian.org
+	AddDefaultCharset utf-8
+	<LocationMatch "/changelogs/(main|contrib|non-free)">
+		ForceType text/plain
+	</LocationMatch>
+</VirtualHost>
 
 # bits.debian.org
 ######################
@@ -95,7 +122,6 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
 		<% end -%>
 	</Directory>
 
-	DefaultType text/plain
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 	AddOutputFilter INCLUDES .xhtml
 </VirtualHost>
@@ -117,6 +143,15 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
 	RedirectPermanent / http://www.ports.debian.org/
 </VirtualHost>
 
+# video.debian.net
+###################
+<VirtualHost <%= vhost_listen %> >
+	ServerName video.debian.net
+	ServerAdmin debian-admin@debian.org
+
+	Redirect / http://meetings-archive.debian.net/pub/debian-meetings/
+</VirtualHost>
+
 # historical sites
 ##################
 # now only redirects remain