X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=f505aaee1060a677c5a08e0c44f06b50fe6e8ba8;hb=3ed94f1ce57fb84cc8d22a0f45d9fe11217135b7;hp=96e71a138dd2c8cfb948e21f00578ceef7434c17;hpb=c4e401c9464862b4987da1f2fd0e7d5d870cda0b;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 96e71a138..f505aaee1 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -10,6 +10,7 @@
# Make sure that the srm.conf directive is commented out.
AddDefaultCharSet Off
AllowOverride AuthConfig FileInfo
+ Require all granted
# Serve icons as image/x-icon
AddType image/x-icon .ico
@@ -86,27 +87,75 @@
- >
- ServerName www.nl.debian.org
+
+ ServerName debian.org
ServerAdmin webmaster@debian.org
- ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at www.debian.eu debian.eu debian.com debian.us www.debian.us debian.gr www.debian.gr
+
+ 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
+
+ ServerAlias www.debian.eu
+ ServerAlias debian.eu
+
+ ServerAlias www.debian.fi
+ ServerAlias debian.fi
+
+ ServerAlias www.debian.nl
+ ServerAlias debian.nl
+
+ ServerAlias www.debian.com
+ ServerAlias debian.com
+
+ ServerAlias debian.us
+ ServerAlias www.debian.us
+
+ ServerAlias debian.gr
+ ServerAlias www.debian.gr
+
+ 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
+
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
- RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
- RewriteLogLevel 1
-
- RewriteEngine on
- RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
-
+ CustomLog /var/log/apache2/www-other.debian.org-access.log privacy+host
+
- >
+
ServerName www.debian.org
ServerAdmin webmaster@debian.org
ServerAlias www-*.debian.org
+ <% if scope.function_onion_global_service_hostname(['www.debian.org']) -%>
+ ServerAlias <%= scope.function_onion_global_service_hostname(['www.debian.org']) %>
+ <% end %>
+
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
@@ -120,11 +169,11 @@
RewriteRule ^/(?!devel/website/errors/)(.*/)?404\.(.+)\.html$ /devel/website/errors/404.$2.html [L]
# the joys of backwards compatibility
- RedirectPermanent /cgi-bin/cvsweb http://cvs.debian.org
- RedirectPermanent /Lists-Archives http://lists.debian.org
- RedirectPermanent /search http://search.debian.org
- RedirectPermanent /Packages http://packages.debian.org
- RedirectPermanent /lintian http://lintian.debian.org
+ RedirectPermanent /cgi-bin/cvsweb https://cvs.debian.org
+ RedirectPermanent /Lists-Archives https://lists.debian.org
+ RedirectPermanent /search https://search.debian.org
+ RedirectPermanent /Packages https://packages.debian.org
+ RedirectPermanent /lintian https://lintian.debian.org
RedirectPermanent /SPI http://www.spi-inc.org
# RedirectPermanent /OpenHardware http://www.openhardware.org
@@ -132,9 +181,9 @@
RedirectPermanent /Bugs/db/ix/pseudopackages.html /Bugs/pseudo-packages
RewriteEngine on
- RewriteRule ^/Bugs/db/pa/l([^/]+).html$ http://bugs.debian.org/$1
- RewriteRule ^/Bugs/db/[[:digit:]][[:digit:]]/([[:digit:]][[:digit:]][[:digit:]]+).html$ http://bugs.debian.org/$1
- RewriteRule ^/Bugs/db/ma/l([^/]+).html$ http://bugs.debian.org/cgi-bin/pkgreport.cgi?maintenc=$1
+ RewriteRule ^/Bugs/db/pa/l([^/]+).html$ https://bugs.debian.org/$1
+ RewriteRule ^/Bugs/db/[[:digit:]][[:digit:]]/([[:digit:]][[:digit:]][[:digit:]]+).html$ https://bugs.debian.org/$1
+ RewriteRule ^/Bugs/db/ma/l([^/]+).html$ https://bugs.debian.org/cgi-bin/pkgreport.cgi?maintenc=$1
UserDir disabled
@@ -148,7 +197,7 @@
RedirectPermanent /doc/packaging-manuals/packaging-tutorial /doc/manuals/packaging-tutorial
RedirectPermanent /doc/prospective-packages /devel/wnpp/
RedirectPermanent /devel/maintainer_contacts /intro/organization
- RedirectPermanent /devel/debian-installer/gtk-frontend http://wiki.debian.org/DebianInstaller/GUI
+ RedirectPermanent /devel/debian-installer/gtk-frontend https://wiki.debian.org/DebianInstaller/GUI
RedirectPermanent /zh/ /international/Chinese/
RedirectPermanent /chinese/ /international/Chinese/
RedirectPermanent /devel/help /devel/join/
@@ -165,11 +214,17 @@
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/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
@@ -183,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]
@@ -219,15 +277,46 @@
# 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]
+
+
+
+ >
+ 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 volatile.debian.org
- ServerAlias volatile-master.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/
+ Use common-www-other.d.o
+
+ ErrorLog /var/log/apache2/www-other.debian.org-error.log
+ CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
+
+ Redirect permanent / http://www.debian.org/
+
+ >
+ Use common-www-other.d.o
+
+ 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 debian.org
+ Use common-ssl-HSTS