X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=c3ffd240c1b4e9638d6dff96ca737bdaea2ce6ee;hb=ad144c20d54eb33597becebd0734d64e7b2fdea6;hp=197c60c379782a0e633d07d296bad79df530f3bd;hpb=fec4861e676415e8952b36c308ed40f7ce060fc4;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 197c60c37..c3ffd240c 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -136,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
@@ -145,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
@@ -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>