Merge pull request #3447 from alexgibson/bug-1215633-redirect-firstru…

…n-learnmore-to-sumo

[fix bug 1215633] Temporarily redirect /firefox/firstrun/learnmore/ to SUMO

bedrock/firefox/redirects.py

@@ -217,4 +217,8 @@ def firefox_mobile_faq(request, *args, **kwargs):
     # bug 1211907
     redirect(r'^firefox/independent/?$', 'firefox.new'),
     redirect(r'^firefox/personal/?$', 'firefox.new'),
+
+    # bug 1215633
+    redirect(r'^firefox/(?:\d+\.\d+\.?(?:\d+)?\.?(?:\d+)?(?:[a|b]?)(?:\d*)(?:pre)?(?:\d)?)/firstrun/learnmore/?$',
+             'https://support.mozilla.org/kb/private-browsing-use-firefox-without-history', permanent=False),
 )

etc/httpd/global.conf

@@ -372,6 +372,9 @@ RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox(/(?:\d+\.\d+\.?(?:\d+)?\.?(?:\d+)?(?
 # bug 1003703, 1009630
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox(/.+)/firstrun/eu/?$ /$1firefox$2/firstrun/?utm_source=direct&utm_medium=none&utm_campaign=redirect&utm_content=eu-firstrun-redirect [L,R=301]
 
+# bug 1215633
+RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox(/(?:\d+\.\d+\.?(?:\d+)?\.?(?:\d+)?(?:[a|b]?)(?:\d*)(?:pre)?(?:\d)?))?/firstrun/learnmore(/?)$ /b/$1firefox$2/firstrun/learnmore$3 [PT]
+
 # bug 748503
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/nightly/firstrun(.*)$ /b/$1firefox/nightly/firstrun$2 [PT]
 

test_redirects/map_globalconf.py

@@ -804,4 +804,9 @@
     # bug 960689, 1013349, 896474
     url_test('/about/legal.html', '/about/legal/'),
     url_test('/about/partnerships.html', '/about/partnerships/'),
+
+    # bug 1215633
+    url_test('/firefox/42.0/firstrun/learnmore',
+             'https://support.mozilla.org/kb/private-browsing-use-firefox-without-history',
+             status_code=302),
 ))