X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=e0fb2c653691b4a7d8472fd5e76b551a631e1f77;hb=85cbaadbe27c8314ba5c5af8aa3f8f28271d0b60;hp=faac61e4931a3efc1966f542323a5084943d4d22;hpb=55c07ad88f8a8c81b1d419bce4f4baad3c1281ea;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 faac61e49..e0fb2c653 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -97,9 +97,6 @@
    ServerAlias www.debian.eu
    ServerAlias debian.eu
 
-   ServerAlias www.debian.fi
-   ServerAlias debian.fi
-
    ServerAlias www.debian.nl
    ServerAlias debian.nl
 
@@ -139,7 +136,6 @@
    RewriteRule ^/(?!devel/website/errors/)(.*/)?404\.(.+)\.html$ /devel/website/errors/404.$2.html [L]
 
 # the joys of backwards compatibility
-   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
@@ -148,6 +144,7 @@
    RedirectPermanent /SPI https://www.spi-inc.org
 #   RedirectPermanent /OpenHardware http://www.openhardware.org
    RedirectPermanent /OpenSource https://opensource.org
+   RedirectPermanent /misc/bsd.license https://opensource.org/licenses/BSD-3-Clause
 
    RedirectPermanent /Bugs/db/ix/pseudopackages.html /Bugs/pseudo-packages
    RewriteEngine on
@@ -194,6 +191,9 @@
    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
@@ -277,6 +277,10 @@
 # Relocation of derivatives pages
    RewriteRule ^/misc/children-distros(?:\.html)?$ /derivatives/ [R=301,L]
    RewriteRule ^/misc/children-distros(\.[^\.]+(?:\.html)?)$ /derivatives/index$1 [R=301,L]
+
+# Relocation of memberships information
+   RewriteRule ^/misc/memberships(?:\.html)?$ /intro/organization$1#memberships [R=301,L]
+   RewriteRule ^/misc/memberships(\.[^\.]+(?:\.html)?)$ /intro/organization$1#memberships [R=301,L]
 </Macro>
 
 <Macro common-www.d.o>
@@ -323,7 +327,7 @@
    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/
+   Redirect / https://www.debian.org/
 </VirtualHost>
 <VirtualHost <%= @vhost_listen_443 %> >
    Use common-www-other.d.o
@@ -331,7 +335,13 @@
    CustomLog /var/log/apache2/www-other-access.log privacyssl
    ErrorLog /var/log/apache2/www-other-error.log
 
-   Redirect permanent / https://www.debian.org/
+   # Legacy GPG versions (including 2.2.12 in buster/Debian 10) use the "direct method" instead
+   # of the "advanced method" which should be tried first according to the draft
+   # https://tools.ietf.org/html/draft-koch-openpgp-webkey-service
+   # also cf. RT#7828
+   Redirect /.well-known/openpgpkey/ https://openpgpkey.debian.org/.well-known/openpgpkey/debian.org/
+
+   Redirect / https://www.debian.org/
 
    Use common-debian-service-ssl debian.org
    Use common-ssl-HSTS