From: Iain R. Learmonth Date: Sun, 24 Jan 2016 16:15:34 +0000 (+0000) Subject: Redirects /doc/manuals/ to /doc/ X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8c45db667881260cafff394847aeea3d0dadf77e;p=mirror%2Fdsa-puppet.git Redirects /doc/manuals/ to /doc/ The /doc/manuals/ folder contains manuals that are built as part of the webwml process, but does not contain an index file. /doc/ is the logical index file for this, so redirect to that to avoid just providing an Apache index listing. (Fixes: #694927) Signed-off-by: Peter Palfrader --- diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb index b83d602c2..762405992 100644 --- a/modules/roles/templates/apache-www.debian.org.erb +++ b/modules/roles/templates/apache-www.debian.org.erb @@ -277,6 +277,7 @@ # Canonical place for manuals under /doc/manuals/ RewriteCond %{DOCUMENT_ROOT}/doc/manuals/$1 -d RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301] + RewriteRule ^/doc/manuals/?$ /doc/ [L,R=301] # Relocation of blends pages RewriteRule ^/devel/hamradio(.*)$ /blends/hamradio$1 [R=301,L]