X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=4088d28da2b362052a00272e8cb2db521160d8ac;hb=898ea78774b44c2023e8ea91869b3af23a82c416;hp=f9a60015e48b0d3be65dde68818db440639b1ab0;hpb=b9795333dca7fb0fd1177fd87e98eb1b27a08eb5;p=dsa-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 f9a60015..4088d28d 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -5,6 +5,11 @@ Use common-static-vhost backports.debian.org
 Use common-static-vhost-publiclog bits.debian.org
 Use common-static-vhost news.debian.net
 Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCharset utf-8"
+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-with-extra www.ports.debian.org "ServerAlias www.ports-backend.debian.org"
 
 # www.backports.org is the historical place for the backports
 # website and archive.  It is now a CNAME to backports.debian.org:
@@ -17,8 +22,6 @@ Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCha
 	RedirectPermanent /backports.org/    http://backports.debian.org/debian-backports/
 	RedirectPermanent /debian-backports/ http://backports.debian.org/debian-backports/
 	RedirectPermanent / http://backports.debian.org/
-
-	DefaultType text/plain
 </VirtualHost>
 
 
@@ -37,7 +40,22 @@ Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCha
 	RedirectPermanent /mentoring/ http://www.debian.org/women/mentoring
 	RedirectPermanent /press/ http://wiki.debian.org/DebianWomen/Press
 	RedirectPermanent /profiles/ http://www.debian.org/women/profiles/
-
-	DefaultType text/plain
 </VirtualHost>
 # vim:ft=apache:
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName www.debian-ports.org
+	ServerAlias debian-ports.org
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent /archive/           http://archive.ports.debian.org/archive/
+	RedirectPermanent /debian-cd/         http://archive.ports.debian.org/debian-cd/
+	RedirectPermanent /debian-snapshot/   http://archive.ports.debian.org/debian-snapshot/
+	RedirectPermanent /debian/            http://archive.ports.debian.org/debian/
+	RedirectPermanent / http://www.ports.debian.org/
+</VirtualHost>
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName ports.debian.net
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent / http://www.ports.debian.org/
+</VirtualHost>