X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=c3ffd240c1b4e9638d6dff96ca737bdaea2ce6ee;hb=9a1fd5f05a8593ae282383bbace383992cb720ff;hp=070152f300c0a93c3d9778d150a6d4b56aa02432;hpb=e4bf13bb537e388c6e63aaaf35f57b042e78c5ad;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 070152f30..c3ffd240c 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 @@ -280,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]