Merge pull request #3246 from alexgibson/bug-1186373-redirect-hello-n…

…ps-survey-links [fix bug 1186373] Add a redirect for Hello's NPS survey links
mozilla · Aug 27, 2015 · 67f1793 · 67f1793
2 parents 398a354 + 07dec8a
commit 67f1793
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/bedrock/redirects/urls.py b/bedrock/redirects/urls.py
@@ -69,6 +69,11 @@ def tabzilla_css_redirect(r):
              'styleguide.communications.copy-rules'),
     redirect(r'^firefox/brand/downloads/$', 'styleguide.home'),
 
+    # Bug 1186373
+    redirect(r'^firefox/hello/npssurvey/$',
+             'https://www.surveygizmo.com/s3/2227372/Firefox-Hello-Product-Survey',
+             permanent=False),
+
     # Bug 1071318
     redirect(r'^firefox/mobile/$', 'firefox.android.index'),
 

diff --git a/etc/httpd/global.conf b/etc/httpd/global.conf
@@ -231,6 +231,9 @@ RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/sync(/?)$ /b/$1firefox/sync$2 [PT]
 # bug 1101984
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/hello(/?)$ /b/$1firefox/hello$2 [PT]
 
+# bug 1186373
+RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/hello/npssurvey(/?)$ /b/$1firefox/hello/npssurvey$2 [PT]
+
 # bug 1071074
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/channel(/?)$ /b/$1firefox/channel$2 [PT]