X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=dad8375fe199686a15c2348f83e9fe7a78ef6be8;hb=0578c547ab8910fbec58d3c9ac68780d3df316b8;hp=ff7ca6137b0ab9bed2cdc1b245a15e2a274d2751;hpb=dc1cd8cf2921db494b3b38350fe42aaf4c130628;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 ff7ca6137..dad8375fe 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,7 +87,7 @@ - > + ServerName debian.org ServerAdmin webmaster@debian.org @@ -115,6 +116,12 @@ 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 @@ -127,29 +134,28 @@ 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 @@ -163,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 @@ -175,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 @@ -191,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/ @@ -208,11 +214,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 @@ -226,7 +236,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] @@ -262,13 +275,23 @@ # 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 @@ -276,15 +299,22 @@ + > + 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/ + > - ServerName debian.org - ServerAdmin webmaster@debian.org + Use common-www-other.d.o - CustomLog /var/log/apache2/www-other-access.log privacy + 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-debian-service-ssl debian.org Use common-ssl-HSTS