X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=f505aaee1060a677c5a08e0c44f06b50fe6e8ba8;hb=1c732b4f31f2b5ea49881f4d96c1730a5c850cfb;hp=3077114a4c23ece1e394baae05f36d923dd3a667;hpb=fcd178e69f31c2bb35f10b6608b8799a69297f1d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 3077114a4..f505aaee1 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -142,8 +142,9 @@
    ServerAlias newwww.deb.at
 
    DocumentRoot <%= wwwdo_document_root %>/
+   LogFormat "0.0.0.0 - %u %{[%d/%b/%Y:00:00:00 %z]}t \"%r\" %>s %b \"%{Referer}i\" \"-\" %V" privacy+host
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
-   CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
+   CustomLog /var/log/apache2/www-other.debian.org-access.log privacy+host
 </Macro>
 
 <Macro common-www.d.o>
@@ -222,6 +223,8 @@
    RedirectPermanent /ports/ppc64   /ports/powerpc
    RedirectPermanent /ports/ppc64el   /ports/powerpc
    RedirectPermanent /ports/powerpcspe   /ports/powerpc
+   RedirectPermanent /mirror/official_sponsors /mirror/sponsors
+   RedirectPermanent /mirror/official /mirror/list
    RedirectPermanent /mirror/mirrors_full.html /mirror/list-full.html
    RedirectPermanent /mirrors /mirror
    RedirectPermanent /News/project /News/weekly