X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=197c60c379782a0e633d07d296bad79df530f3bd;hb=bd7d026dba49c5698d3c5c76e4c7a6b99d40d213;hp=f124f48a7f0bb096fda001fa4b1c5e3bf18e3b6f;hpb=63df0543e44a07b3ebce0f4134897a239c192978;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 f124f48a7..197c60c37 100644 --- a/modules/roles/templates/apache-www.debian.org.erb +++ b/modules/roles/templates/apache-www.debian.org.erb @@ -4,12 +4,13 @@ ## # Need to turn on negotiation_module -/> +/> Options +MultiViews +FollowSymLinks +Indexes AddHandler type-map var # 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,42 @@ - > - 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 - 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 - RewriteEngine on - RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L] - + ServerAlias www.debian.net + ServerAlias debian.net + + ServerAlias www.debian.eu + ServerAlias debian.eu + + ServerAlias www.debian.nl + ServerAlias debian.nl - > - ServerName www.debian.org + 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.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+host + + + 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 + DocumentRoot <%= @wwwdo_document_root %>/ # CacheNegotiatedDocs: By default, Apache sends Pragma: no-cache with each # document that was negotiated on the basis of content. This asks proxy @@ -120,21 +136,21 @@ 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 /SPI https://www.spi-inc.org # RedirectPermanent /OpenHardware http://www.openhardware.org - RedirectPermanent /OpenSource http://www.opensource.org + RedirectPermanent /OpenSource https://opensource.org 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 +164,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/ @@ -164,10 +180,22 @@ RedirectPermanent /misc/README.non-US /mirror/list.non-US 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/mips64el /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 + Redirect /ports/riscv64 https://wiki.debian.org/RISC-V + Redirect /ports/x32 https://wiki.debian.org/X32Port + Redirect /ports/sh4 https://wiki.debian.org/SH4 + 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 @@ -181,24 +209,33 @@ 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 + +# Upper-case URLs were a bad idea + RedirectPermanent /bugs /Bugs + RedirectPermanent /news /News + RedirectPermanent /mailinglists /MailingLists + RedirectPermanent /cd /CD RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301] RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04.html#submit-bug [NE,R=301] - RewriteRule ^/devel/debian-installer/hooks(.*) http://d-i.alioth.debian.org/doc/internals/apb.html [R=301] - RewriteRule ^/doc/packaging-manuals/mime-policy(.*) /doc/debian-policy/ch-opersys.html#s-mime [NE,R=301] + RewriteRule ^/devel/debian-installer/hooks(.*) https://d-i.alioth.debian.org/doc/internals/apb.html [R=301] + RewriteRule ^/doc/packaging-manuals/mime-policy(.*) /doc/debian-policy/ch-opersys.html#s-mime [NE,R=302] RewriteRule ^/volatile/index.* - [S=1] RewriteRule ^/volatile/.+ /volatile/ [L,R=301] RewriteRule ^/devel/debian-volatile/.* /volatile/ [R=301] # Offer a Redirect to DSA without knowing year #474730 - RewriteMap dsa txt:<%= wwwdo_document_root %>/security/map-dsa.txt + RewriteMap dsa txt:<%= @wwwdo_document_root %>/security/map-dsa.txt RewriteRule ^/security/dsa-(\d+)(\..*)? /security/${dsa:$1}$2 [R=301] # Compatibility after SGML -> DocBook # Debian Reference #624239 - RewriteMap reference txt:<%= wwwdo_document_root %>/doc/map-reference.txt + RewriteMap reference txt:<%= @wwwdo_document_root %>/doc/map-reference.txt RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/ch-support$1 !-f RewriteRule ^/doc/manuals/debian-reference/ch-support(.*) /support$1 [L,R=301] RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/${reference:$1}$2 -f @@ -210,22 +247,94 @@ RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/footnotes$1 !-f RewriteRule ^/doc/manuals/debian-reference/footnotes(.+) /doc/manuals/debian-reference/index$1 [L,R=301] RewriteRule ^/doc/manuals/debian-reference/footnotes$ /doc/manuals/debian-reference/ [R=301] + +# DevRef filename changes c2016 + RedirectMatch permanent ^(/doc/manuals/developers-reference)/scope(\.[a-z]{2})?.html $1/ch01$2.html + RedirectMatch permanent ^(/doc/manuals/developers-reference)/new-maintainer(\.[a-z]{2})?.html $1/ch02$2.html + RedirectMatch permanent ^(/doc/manuals/developers-reference)/developer-duties(\.[a-z]{2})?.html $1/ch03$2.html + RedirectMatch permanent ^(/doc/manuals/developers-reference)/resources(\.[a-z]{2})?.html $1/ch04$2.html + RedirectMatch permanent ^(/doc/manuals/developers-reference)/pkgs(\.[a-z]{2})?.html $1/ch05$2.html + RedirectMatch permanent ^(/doc/manuals/developers-reference)/best-pkging-practices(\.[a-z]{2})?.html $1/ch06$2.html + RedirectMatch permanent ^(/doc/manuals/developers-reference)/beyond-pkging(\.[a-z]{2})?.html $1/ch07$2.html + RedirectMatch permanent ^(/doc/manuals/developers-reference)/l10n(\.[a-z]{2})?.html $1/ch08$2.html + RedirectMatch permanent ^(/doc/manuals/developers-reference)/tools(\.[a-z]{2})?.html $1/apa$2.html + # New Maintainers' Guide RewriteRule ^/doc/(manuals/)?maint-guide/ch-(.*) /doc/manuals/maint-guide/$2 [R=301] RewriteRule ^/doc/(manuals/)?maint-guide/footnotes(.*) /doc/manuals/maint-guide/index$2 [R=301] +# Compatibility after Debian Policy changed to build with Sphinx (bug #877367) + RewriteRule ^/doc/debian-policy/footnotes.html(.*) /doc/debian-policy/ [R=301,L] + # 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] + +# Relocation of derivatives pages + RewriteRule ^/misc/children-distros(?:\.html)?$ /derivatives/ [R=301,L] + RewriteRule ^/misc/children-distros(\.[^\.]+(?:\.html)?)$ /derivatives/index$1 [R=301,L] + + + + ServerName <%= @wwwdo_server_name %> + + Use common-www.d.o-inner + + + > + ErrorLog /var/log/apache2/www.debian.org-error.log + CustomLog /var/log/apache2/www.debian.org-access.log privacy + + ServerName <%= @wwwdo_server_name %> + Redirect / https://<%= @wwwdo_server_name %>/ + > + ErrorLog /var/log/apache2/www.debian.org-error.log + CustomLog /var/log/apache2/www.debian.org-access.log privacyssl + Use common-www.d.o - > - 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-debian-service-ssl <%= @wwwdo_server_name %> + Use common-ssl-HSTS + +<% if scope.function_onion_global_service_hostname([@wwwdo_server_name]) -%> + > + ErrorLog /var/log/apache2/www.debian.org-error.log + CustomLog /var/log/apache2/www.debian.org-access.log privacy + + ServerName <%= scope.function_onion_global_service_hostname([@wwwdo_server_name]) %> + + Use common-www.d.o-inner + +<% end %> + + +<%- if @redirect_vhosts -%> +# www other +########### + > + 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 / https://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 +<%- end -%> +# vim:set syn=apache: