X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=659958314738c18070653d31c2707b8b40df80ea;hb=f97bd2a2a0cccb68e4de5e8cca2ebaebab0ab153;hp=888c5897bf4d4bdc33b38a9bac317465fa0ec029;hpb=412c8ece737746a2a4e33c75e7e79270c8680077;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 888c5897b..659958314 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -4,6 +4,10 @@
 # deb.debian.org
 <% if scope.function_has_static_component(['deb.debian.org']) -%>
 <Macro vstatic-vhost-extra-deb.debian.org>
+	ServerAlias httpredir.debian.org
+	ServerAlias cdn.debian.net
+	ServerAlias http.debian.net
+
 	Redirect /debian/           http://cdn-fastly.deb.debian.org/debian/
 	Redirect /debian-debug/     http://cdn-fastly.deb.debian.org/debian-debug/
 	Redirect /debian-ports/     http://cdn-fastly.deb.debian.org/debian-ports/
@@ -29,7 +33,6 @@
 	<Directory /srv/static.debian.org/mirrors/deb.debian.org/cur>
 		AllowOverride FileInfo Indexes Options=Multiviews
 		Options Indexes SymLinksIfOwnerMatch
-		IndexOptions FancyIndexing NameWidth=*
 		Require all granted
 	</Directory>
 
@@ -79,7 +82,6 @@
 	<Directory /srv/static.debian.org/mirrors/release.debian.org-pu/cur>
 		Require all granted
 		Options Indexes SymLinksIfOwnerMatch MultiViews
-		IndexOptions FancyIndexing NameWidth=*
 
 		AddEncoding gzip .gz
 		FilterDeclare gzip CONTENT_SET
@@ -100,7 +102,6 @@
 	<Directory /srv/static.debian.org/mirrors/www.ports.debian.org/cur>
 		AllowOverride FileInfo Indexes Options=Multiviews
 		Options Multiviews Indexes FollowSymLinks Includes
-		IndexOptions FancyIndexing NameWidth=*
 		Require all granted
 	</Directory>
 
@@ -198,6 +199,7 @@ vhost(lines, "appstream.debian.org"          , :ssl => true)
 vhost(lines, "apt.buildd.debian.org"         , :ssl => true)
 vhost(lines, "dsa.debian.org"                , :ssl => true)
 vhost(lines, "rtc.debian.org"                , :ssl => true)
+vhost(lines, "mirror-master.debian.org"      , :ssl => true)
 vhost(lines, "onion.debian.org"              , :ssl => true)
 vhost(lines, "manpages.debian.org"           , :ssl => true, :extra => true)
 
@@ -314,4 +316,10 @@ lines.join("\n")
 	RedirectPermanent / https://backports.debian.org/
 </VirtualHost>
 
+<VirtualHost <%= vhost_listen %> >
+	ServerName manpages.debian.net
+	ServerAdmin debian-admin@debian.org
+	Redirect / https://manpages.debian.org/
+</VirtualHost>
+
 # vim:ft=apache: