X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=f6e56b638e49a923f1c8c6ce33934fceff941509;hb=b1b343629e60e93500d63bcf87038d42b262cc98;hp=41947136bb39a93cc5de4dd022581fd4666147a9;hpb=d31cce2ed31d4e107c5418fed8d3d3b49a6bceb6;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 41947136b..f6e56b638 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -4,7 +4,13 @@ Use common-static-vhost mozilla.debian.net
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 metadata.ftp-master.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-ssl dsa.debian.org
+Use common-static-vhost-ssl rtc.debian.org
# www.backports.org is the historical place for the backports
# website and archive. It is now a CNAME to backports.debian.org:
@@ -19,4 +25,81 @@ Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCha
RedirectPermanent / http://backports.debian.org/
+
+ >
+ ServerName women.debian.org
+ ServerAdmin debian-admin@debian.org
+
+ RedirectPermanent / http://www.debian.org/women/
+
+ RedirectPermanent /about/ http://www.debian.org/women/about
+ RedirectPermanent /contact/ http://www.debian.org/women/contact
+ RedirectPermanent /faqs/ http://www.debian.org/women/faq
+ RedirectPermanent /home/ http://www.debian.org/women/
+ RedirectPermanent /images/dw.png http://www.debian.org/women/dw.png
+ RedirectPermanent /involvement/ http://www.debian.org/women/participate
+ RedirectPermanent /mentoring/ http://www.debian.org/women/mentoring
+ RedirectPermanent /press/ http://wiki.debian.org/DebianWomen/Press
+ RedirectPermanent /profiles/ http://www.debian.org/women/profiles/
+
+
+# debian ports stuff
+####################
+ >
+ ServerName www.ports.debian.org
+ ServerAlias www.ports-backend.debian.org
+ ServerAdmin debian-admin@lists.debian.org
+
+ ErrorLog /var/log/apache2/www.ports.debian.org-error.log
+ CustomLog /var/log/apache2/www.ports.debian.org-access.log privacy
+
+
+ UserDir disabled
+
+ ServerSignature On
+
+ DocumentRoot /srv/static.debian.org/mirrors/www.ports.debian.org/cur
+
+ AllowOverride FileInfo Indexes Options=Multiviews
+ Options Multiviews Indexes FollowSymLinks Includes
+ IndexOptions FancyIndexing NameWidth=*
+ Order allow,deny
+ Allow from all
+
+
+ DefaultType text/plain
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+ AddOutputFilter INCLUDES .xhtml
+
+
+ >
+ 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/
+
+
+ >
+ ServerName ports.debian.net
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent / http://www.ports.debian.org/
+
+
+ >
+ ServerName volatile.debian.org
+ ServerAlias volatile-master.debian.org
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent / http://www.debian.org/volatile/
+
+
+ >
+ ServerName ftp-master.metadata.debian.org
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent / http://metadata.ftp-master.debian.org/
+
+
# vim:ft=apache: