X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=adaed409b15e60557b3a803057ce63b8ec9ad8f1;hb=02877fd7a80d851f757aa7d6ea19fa5f84c5d40e;hp=4088d28da2b362052a00272e8cb2db521160d8ac;hpb=898ea78774b44c2023e8ea91869b3af23a82c416;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 4088d28d..adaed409 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -4,12 +4,12 @@ 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-with-extra www.ports.debian.org "ServerAlias www.ports-backend.debian.org"
+Use common-static-vhost-ssl dsa.debian.org
 
 # www.backports.org is the historical place for the backports
 # website and archive.  It is now a CNAME to backports.debian.org:
@@ -41,7 +41,35 @@ Use common-static-vhost-with-extra www.ports.debian.org "ServerAlias www.ports-b
 	RedirectPermanent /press/ http://wiki.debian.org/DebianWomen/Press
 	RedirectPermanent /profiles/ http://www.debian.org/women/profiles/
 </VirtualHost>
-# vim:ft=apache:
+
+# debian ports stuff
+####################
+<Virtualhost <%= vhost_listen %> >
+	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
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
+	ServerSignature On
+
+	DocumentRoot /srv/static.debian.org/mirrors/www.ports.debian.org/cur
+	<Directory /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
+	</Directory>
+
+	DefaultType text/plain
+	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+	AddOutputFilter INCLUDES .xhtml
+</VirtualHost>
 
 <VirtualHost <%= vhost_listen %> >
 	ServerName www.debian-ports.org
@@ -59,3 +87,18 @@ Use common-static-vhost-with-extra www.ports.debian.org "ServerAlias www.ports-b
 	ServerAdmin debian-admin@debian.org
 	RedirectPermanent / http://www.ports.debian.org/
 </VirtualHost>
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName volatile.debian.org
+	ServerAlias volatile-master.debian.org
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent / http://www.debian.org/volatile/
+</VirtualHost>
+
+<VirtualHost <%= vhost_listen %> >
+	ServerName ftp-master.metadata.debian.org
+	ServerAdmin debian-admin@debian.org
+	RedirectPermanent / http://metadata.ftp-master.debian.org/
+</VirtualHost>
+
+# vim:ft=apache: