Merge pull request #3738 from pmclanahan/fix-sumo-redirects-1236910

Fix bug 1236910: Add redirects for SUMO

bedrock/firefox/redirects.py

@@ -275,4 +275,7 @@ def firefox_mobile_faq(request, *args, **kwargs):
     redirect(r'^projects/seamonkey/releases/updates/(?P<x>.*)$',
              'http://www.seamonkey-project.org/releases/updates/{x}'),
     redirect(r'^projects/seamonkey/start/$', 'http://www.seamonkey-project.org/start/'),
+
+    # Bug 638948 redirect beta privacy policy link
+    redirect(r'^firefox/beta/feedbackprivacypolicy/?$', '/privacy/firefox/'),
 )

bedrock/mozorg/redirects.py

@@ -572,6 +572,9 @@ def decider(request, **kwargs):
     # bug 1003737
     redirect(r'^impressum/?$', '/about/legal/impressum/'),
 
+    # bug 1236910
+    redirect(r'^support(/.*)?$', 'https://support.mozilla.org/'),
+
     # bug 832348 **/index.html -> **/
     # leave this at the bottom
     redirect(r'^(.*)/index\.html$', '/{}/', locale_prefix=False),

etc/httpd/global.conf

@@ -753,3 +753,7 @@ RewriteRule ^(/(?:\w{2,3}(?:-\w{2})?/)?projects/xforms/2005/type)$ /b$1 [PT]
 RewriteRule ^(/xbl)$ /b$1 [PT]
 
 RewriteRule ^(/(?:\w{2,3}(?:-\w{2})?/)?projects/seamonkey(/.*)?)$ /b$1 [PT]
+
+RewriteRule ^(/(?:\w{2,3}(?:-\w{2})?/)?support(?:/.*)?)$ /b$1 [PT]
+
+RewriteRule ^(/(?:\w{2,3}(?:-\w{2})?/)?firefox/beta/feedbackprivacypolicy/?)$ /b$1 [PT]

test_redirects/map_htaccess.py

@@ -116,4 +116,9 @@
              'http://www.seamonkey-project.org/releases/updates/so-good'),
     url_test('/projects/seamonkey/start/', 'http://www.seamonkey-project.org/start/'),
 
+    # bug 1236910
+    url_test('/support/firefox/options', 'https://support.mozilla.org/'),
+
+    # Bug 638948 redirect beta privacy policy link
+    url_test('/firefox/beta/feedbackprivacypolicy/', '/privacy/firefox/'),
 ))