X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=10c820c007f7298126a26281f77654807deb2f4c;hb=430bafcbf3dbdcd7805e18e20a9d0d3db96ea8cc;hp=bfb0008d3b03dd5198216096370e9fc92be4d61e;hpb=fcc438406c1c215f1e73c1b01511c1548cc40aac;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 bfb0008d..10c820c0 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -7,6 +7,9 @@ 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:
@@ -39,3 +42,27 @@ Use common-static-vhost-with-extra network-test.debian.org "ServerAlias network-
 	RedirectPermanent /profiles/ http://www.debian.org/women/profiles/
 </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>
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName ports.debian.org
+	ServerAdmin debian-admin@debian.org
+	Options MultiViews Includes
+	AddOutputFilter INCLUDES .xhtml
+</VirtualHost>