From 3951308ce9ce3b9a17bb6ba9702d830037333d0d Mon Sep 17 00:00:00 2001
From: Alex Gibson <agibson@mozilla.com>
Date: Thu, 1 Oct 2015 13:39:57 +0100
Subject: [PATCH] [fix bug 1209643] Links from foundation/moco result in 404

---
 bedrock/foundation/templates/foundation/moco.html |  4 ++--
 bedrock/mozorg/redirects.py                       |  6 ++++++
 etc/httpd/global.conf                             | 13 +++++--------
 test_redirects/map_globalconf.py                  |  7 +++++++
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/bedrock/foundation/templates/foundation/moco.html b/bedrock/foundation/templates/foundation/moco.html
index eab2ca5e88..cfb0b8e021 100644
--- a/bedrock/foundation/templates/foundation/moco.html
+++ b/bedrock/foundation/templates/foundation/moco.html
@@ -59,7 +59,7 @@
 
   <h2>{{ _('Documents') }}</h2>
   <ul>
-    <li><a href="/legal/articles.html">{{ _('Articles of  Incorporation') }}</a></li>
-    <li><a href="/legal/bylaws.html">{{ _('Bylaws of the Mozilla Corporation') }}</a></li>
+    <li><a href="{{ url('foundation.documents.articles-of-incorporation') }}">{{ _('Articles of  Incorporation') }}</a></li>
+    <li><a href="{{ url('foundation.documents.bylaws') }}">{{ _('Bylaws of the Mozilla Corporation') }}</a></li>
   </ul>
 {% endblock %}
diff --git a/bedrock/mozorg/redirects.py b/bedrock/mozorg/redirects.py
index 8fdda51139..005455ba9b 100644
--- a/bedrock/mozorg/redirects.py
+++ b/bedrock/mozorg/redirects.py
@@ -222,6 +222,12 @@ redirectpatterns = (
     redirect(r'^legal/eula/firefox-2/?$', '/about/legal/eula/firefox-2/'),
     redirect(r'^legal/eula/firefox-3/?$', '/about/legal/eula/firefox-3/'),
 
+    # Bug 1209643
+    redirect(r'^legal/bylaws_amendment_(?P<n>[12])(\.html|/)?', '/foundation/documents/bylaws-amendment-{n}/'),
+    redirect(r'^legal/articles(\.html|/)?', 'foundation.documents.articles-of-incorporation'),
+    redirect(r'^legal/amendment(\.html|/)?', 'foundation.documents.articles-of-incorporation-amendment'),
+    redirect(r'^legal/bylaws(\.html|/)?', 'foundation.documents.bylaws'),
+
     # Bug 1073269 /dnt/ -> /firefox/dnt/
     redirect(r'^dnt/?$', 'firefox.dnt'),
 
diff --git a/etc/httpd/global.conf b/etc/httpd/global.conf
index e81dfe3ab9..81b5968839 100644
--- a/etc/httpd/global.conf
+++ b/etc/httpd/global.conf
@@ -498,12 +498,11 @@ RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?foundation/documents/(index|mozilla-200.-fin
 # bug 442671
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?foundation/trademarks/l10n-policy(/?)$ /$1foundation/trademarks/ [L,R=301]
 
-# bug 960689
-RewriteRule ^/en-US/legal/bylaws_amendment_1(?:\.html)?$ /foundation/documents/bylaws-amendment-1/ [L,R=301]
-RewriteRule ^/en-US/legal/bylaws_amendment_2(?:\.html)?$ /foundation/documents/bylaws-amendment-2/ [L,R=301]
-RewriteRule ^/en-US/legal/articles(?:\.html)?$ /foundation/documents/articles-of-incorporation/ [L,R=301]
-RewriteRule ^/en-US/legal/amendment(?:\.html)?$ /foundation/documents/articles-of-incorporation/amendment/ [L,R=301]
-RewriteRule ^/en-US/legal/bylaws(?:\.html)?$ /foundation/documents/bylaws/ [L,R=301]
+# bug 960689, 1209643
+RewriteRule ^(/(\w{2,3}(?:-\w{2})?/)?legal/bylaws_amendment_(?:[12])(?:\.html)?)$ /b$1 [PT]
+RewriteRule ^(/(\w{2,3}(?:-\w{2})?/)?legal/articles(?:\.html)?)$ /b$1 [PT]
+RewriteRule ^(/(\w{2,3}(?:-\w{2})?/)?legal/amendment(?:\.html)?)$ /b$1 [PT]
+RewriteRule ^(/(\w{2,3}(?:-\w{2})?/)?legal/bylaws(?:\.html)?)$ /b$1 [PT]
 
 
 # Add /b to all foundation URLs to serve them from Bedrock.
@@ -750,5 +749,3 @@ RewriteRule ^(/rhino(/.*)?)$ /b$1 [PT]
 
 # Bug 730488 deprecate /firefox/all-older.html
 RewriteRule ^(/(?:\w{2,3}(?:-\w{2})?/)?firefox/all-older\.html)$ /b$1 [PT]
-
-
diff --git a/test_redirects/map_globalconf.py b/test_redirects/map_globalconf.py
index a2cf147b7c..a8f4747f07 100644
--- a/test_redirects/map_globalconf.py
+++ b/test_redirects/map_globalconf.py
@@ -761,4 +761,11 @@ URLS = flatten((
 
     # Bug 730488 deprecate /firefox/all-older.html
     url_test('/firefox/all-older.html', '/firefox/new/'),
+
+    # Bug 1209643
+    url_test('/legal/bylaws_amendment_1.html', '/foundation/documents/bylaws-amendment-1/'),
+    url_test('/legal/bylaws_amendment_2.html', '/foundation/documents/bylaws-amendment-2/'),
+    url_test('/legal/articles.html', '/foundation/documents/articles-of-incorporation/'),
+    url_test('/legal/amendment.html', '/foundation/documents/articles-of-incorporation/amendment/'),
+    url_test('/legal/bylaws.html', '/foundation/documents/bylaws/'),
 ))