diff --git a/bedrock/redirects/urls.py b/bedrock/redirects/urls.py index 44df7a21389..f8afc98e36a 100644 --- a/bedrock/redirects/urls.py +++ b/bedrock/redirects/urls.py @@ -75,9 +75,4 @@ def tabzilla_css_redirect(r): # Bug 867773 - Redirect the Persona "Developer FAQ" link to MDN redirect(r'^persona/developer-faq/$', 'https://developer.mozilla.org/persona'), - - #Bug 860532- migrate governance, roles, and organizations to bedrock - redirect(r'^about/governance.html$', '/about/governance/'), - redirect(r'^about/roles.html$', '/about/governance/roles/'), - redirect(r'^about/organizations.html', '/about/governance/organizations/') ) diff --git a/etc/httpd/global.conf b/etc/httpd/global.conf index 095c4ff803b..b51008f0f58 100644 --- a/etc/httpd/global.conf +++ b/etc/httpd/global.conf @@ -281,6 +281,12 @@ RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?firefox/nightly/firstrun(.*)$ /b/$1 RewriteRule ^/en-US/newsletter/existing(.*)$ /b/en-US/newsletter/existing$1 [PT] RewriteRule ^/en-US/newsletter/updated(.*)$ /b/en-US/newsletter/updated$1 [PT] +# bug 860532 - Reidrects for governance pages +RewriteRule ^/about/governance\.html$ /about/governance/ [L,R=301] +RewriteRule ^/about/roles\.html$ /about/governance/roles/ [L,R=301] +RewriteRule ^/about/organizations\.html$ /about/governance/organizations/ [L,R=301] +RewriteRule ^/(\w{2,3}(?:-\w{2}(?:-mac)?)?/)?about/governance(.*)$ /b/$1about/governance$2 [PT] + # bug 724633 - Porting foundation pages # Add redirects for the pdfs that were under /foundation/documents/ # that will now be served from static.mozilla.com/foundation/documents/