X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=762405992cd414ff0884c40bdedf863cf8bf3d24;hb=2406640350870f6d2ab9112a247fb733590f15de;hp=566947364ad82650c22cf19a59f81b8292fa889a;hpb=bd04f8be77cc43a2e7b43f5869061359f510473b;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 566947364..762405992 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -119,6 +119,9 @@
ServerAlias www.debian.eu
ServerAlias debian.eu
+ ServerAlias www.debian.fi
+ ServerAlias debian.fi
+
ServerAlias www.debian.com
ServerAlias debian.com
@@ -238,6 +241,7 @@
RedirectPermanent /releases/9 /releases/stretch
RedirectPermanent /releases/10 /releases/buster
RedirectPermanent /releases/unstable /releases/sid
+ RedirectPermanent /support/ /support
RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]
RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04.html#submit-bug [NE,R=301]
@@ -273,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]
@@ -282,14 +287,12 @@
>
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
>
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