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=959ca519863cc0c63ee88a798ba7d312271e6b19;hpb=d4fb891a1a7d58fdeff2687e91f5e6faf822a96c;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 959ca5198..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,15 +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-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
+ >
+ 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
+
+ ForceType text/plain
+
+
# bits.debian.org
######################
@@ -94,7 +122,6 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
<% end -%>
- DefaultType text/plain
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
AddOutputFilter INCLUDES .xhtml
@@ -116,6 +143,15 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
RedirectPermanent / http://www.ports.debian.org/
+# video.debian.net
+###################
+ >
+ ServerName video.debian.net
+ ServerAdmin debian-admin@debian.org
+
+ Redirect / http://meetings-archive.debian.net/pub/debian-meetings/
+
+
# historical sites
##################
# now only redirects remain