Also log to a public access log for www.debian.org mirrors

[dsa-puppet.git] / modules / roles / templates / apache-www.debian.org.erb

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index e09b2a6960a72324ac75150ede8a93b3d797b4f0..566947364ad82650c22cf19a59f81b8292fa889a 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -219,6 +219,9 @@
    RedirectPermanent /ports/kfreebsd-i386  /ports/kfreebsd-gnu
    RedirectPermanent /ports/sparc64 /ports/sparc
    RedirectPermanent /ports/s390x   /ports/s390
+   RedirectPermanent /ports/ppc64   /ports/powerpc
+   RedirectPermanent /ports/ppc64el   /ports/powerpc
+   RedirectPermanent /ports/powerpcspe   /ports/powerpc
    RedirectPermanent /mirror/mirrors_full.html /mirror/list-full.html
    RedirectPermanent /mirrors /mirror
    RedirectPermanent /News/project /News/weekly
@@ -270,18 +273,23 @@
 # Canonical place for manuals under /doc/manuals/
    RewriteCond %{DOCUMENT_ROOT}/doc/manuals/$1 -d
    RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
+
+# Relocation of blends pages
+   RewriteRule ^/devel/hamradio(.*)$ /blends/hamradio$1 [R=301,L]
 </Macro>
 
 
 <VirtualHost <%= vhost_listen %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacy
+   CustomLog /var/log/apache2/www.debian.org-public-access.log privacy
 
    Use common-www.d.o
 </VirtualHost>
 <VirtualHost <%= vhost_listen_443 %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacyssl
+   CustomLog /var/log/apache2/www.debian.org-public-access.log privacyssl
 
    Use common-www.d.o