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=679a44b089bca07759bb1239f9e891fdfd0b051e;hpb=6cd4a98e57474ed8ca8f7b99b8cf485e10c56a85;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 679a44b08..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,11 +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: @@ -59,6 +61,7 @@ Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by- 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 @@ -86,4 +89,17 @@ Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by- 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: