X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=b83d602c28c54088d7ba8cd5fc5044bb93f4035b;hb=b6dd1254a55d3db669f9726c3ebacc9a48148b8e;hp=7775d96856bd78ae793c4106607029891874ac83;hpb=187cf42a3e36d825dd5fa16df5e0e88fbe63e7ab;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 7775d9685..b83d602c2 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -10,6 +10,10 @@
# Make sure that the srm.conf directive is commented out.
AddDefaultCharSet Off
AllowOverride AuthConfig FileInfo
+ <% if @lsbmajdistrelease > '7' -%>
+ Require all granted
+ <% end -%>
+
# Serve icons as image/x-icon
AddType image/x-icon .ico
@@ -90,7 +94,24 @@
ServerName debian.org
ServerAdmin webmaster@debian.org
- ServerAlias www.*.debian.org
+ ServerAlias www.at.debian.org
+ ServerAlias www.au.debian.org
+ ServerAlias www.bg.debian.org
+ ServerAlias www.br.debian.org
+ ServerAlias www.cn.debian.org
+ ServerAlias www.de.debian.org
+ ServerAlias www.es.debian.org
+ ServerAlias www.fr.debian.org
+ ServerAlias www.hk.debian.org
+ ServerAlias www.id.debian.org
+ ServerAlias www.jp.debian.org
+ ServerAlias www.nl.debian.org
+ ServerAlias www.pl.debian.org
+ ServerAlias www.ru.debian.org
+ ServerAlias www.ua.debian.org
+ ServerAlias www.uk.debian.org
+ ServerAlias www.us.debian.org
+ ServerAlias www.za.debian.org
ServerAlias www.debian.net
ServerAlias debian.net
@@ -98,6 +119,9 @@
ServerAlias www.debian.eu
ServerAlias debian.eu
+ ServerAlias www.debian.fi
+ ServerAlias debian.fi
+
ServerAlias www.debian.com
ServerAlias debian.com
@@ -110,6 +134,9 @@
ServerAlias www.debian.es
ServerAlias debian.es
+ ServerAlias www.debian.org.tw
+ ServerAlias debian.org.tw
+
ServerAlias www.debian.at
ServerAlias www.debian.de
ServerAlias newwww.deb.at
@@ -117,20 +144,20 @@
DocumentRoot <%= wwwdo_document_root %>/
ErrorLog /var/log/apache2/www-other.debian.org-error.log
CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
- RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
- RewriteLogLevel 1
+ #RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
+ #RewriteLogLevel 1
RewriteEngine on
RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
- >
+
+
+
ServerName www.debian.org
ServerAdmin webmaster@debian.org
ServerAlias www-*.debian.org
DocumentRoot <%= wwwdo_document_root %>/
- ErrorLog /var/log/apache2/www.debian.org-error.log
- CustomLog /var/log/apache2/www.debian.org-access.log privacy
# CacheNegotiatedDocs: By default, Apache sends Pragma: no-cache with each
# document that was negotiated on the basis of content. This asks proxy
@@ -189,11 +216,15 @@
RedirectPermanent /intl /international
RedirectPermanent /ports/armel /ports/arm
RedirectPermanent /ports/armhf /ports/arm
+ RedirectPermanent /ports/arm64 /ports/arm
RedirectPermanent /ports/mipsel /ports/mips
RedirectPermanent /ports/kfreebsd-amd64 /ports/kfreebsd-gnu
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
@@ -207,7 +238,10 @@
RedirectPermanent /releases/6.0 /releases/squeeze
RedirectPermanent /releases/7 /releases/wheezy
RedirectPermanent /releases/8 /releases/jessie
+ 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]
@@ -244,14 +278,38 @@
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]
+
>
- ServerName volatile.debian.org
- ServerAlias volatile-master.debian.org
+ ErrorLog /var/log/apache2/www.debian.org-error.log
+ CustomLog /var/log/apache2/www.debian.org-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
+
+ Use common-www.d.o
+
+ Use common-debian-service-ssl www.debian.org
+ Use common-ssl-HSTS
+
+
+
+ >
+ ServerName debian.org
ServerAdmin webmaster@debian.org
- ErrorLog /var/log/apache2/volatile.debian.org-error.log
- CustomLog /var/log/apache2/volatile.debian.org-access.log privacy
- RedirectMatch permanent . http://www.debian.org/volatile/
+
+ CustomLog /var/log/apache2/www-other-access.log privacyssl
+ ErrorLog /var/log/apache2/www-other-error.log
+
+ Redirect permanent / https://www.debian.org/
+
+
+ Use common-debian-service-ssl www.debian.org
+ Use common-ssl-HSTS