Add redirects for all the /misc section, and group all the redirects related to ...

[mirror/dsa-puppet.git] / modules / roles / templates / apache-www.debian.org.erb

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index e0fb2c6..f97aab7 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -144,8 +144,6 @@
    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
    RewriteRule ^/Bugs/db/pa/l([^/]+).html$ https://bugs.debian.org/$1
@@ -178,6 +176,11 @@
    RedirectPermanent /ports/laptops /misc/laptops/
    RedirectPermanent /misc/README.mirrors /mirror/list
    RedirectPermanent /misc/README.non-US /mirror/list.non-US
+   RedirectPermanent /misc/awards /News/awards
+   RedirectPermanent /misc/bsd.license https://opensource.org/licenses/BSD-3-Clause
+   RedirectPermanent /misc/laptops https://wiki.debian.org/InstallingDebianOn
+   RedirectPermanent /misc/memberships /intro/organization#memberships
+   RedirectPermanent /misc/merchandise /events/merchandise
    RedirectPermanent /intl /international
    RedirectPermanent /ports/armel  /ports/arm
    RedirectPermanent /ports/armhf  /ports/arm