From 086302275b9dd0e58612447e1aa83ae2a5973d9c Mon Sep 17 00:00:00 2001 From: Paul McLanahan Date: Wed, 5 Mar 2014 14:39:41 -0500 Subject: [PATCH] Bug 952429: Fix some urls for the new calendar holidays page. Also change the redirects for bug 971244 to 301s. --- bedrock/mozorg/urls.py | 2 +- etc/httpd/global.conf | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bedrock/mozorg/urls.py b/bedrock/mozorg/urls.py index eb294f2d4d..d9e6004f2b 100644 --- a/bedrock/mozorg/urls.py +++ b/bedrock/mozorg/urls.py @@ -17,7 +17,7 @@ urlpatterns = patterns('', page('products', 'mozorg/products.html'), page('about/mozilla-based', 'mozorg/projects/mozilla-based.html'), page('projects/calendar', 'mozorg/projects/calendar.html'), - url('projects/calendar/holidays', views.holiday_calendars, name='mozorg.projects.holiday_calendars'), + url('^projects/calendar/holidays/$', views.holiday_calendars, name='mozorg.projects.holiday_calendars'), page('button', 'mozorg/button.html'), page('mission', 'mozorg/mission.html'), page('ITU', 'mozorg/itu.html'), diff --git a/etc/httpd/global.conf b/etc/httpd/global.conf index a1fe375a08..0b28591fe8 100644 --- a/etc/httpd/global.conf +++ b/etc/httpd/global.conf @@ -663,9 +663,11 @@ RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?mobile/android-download-beta\.html https://p # bug 723267 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?projects/calendar(/?)$ /b/$1projects/calendar$2 [PT] -# bug 885799 -RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?projects/calendar/holidays.html$ /b/$1projects/calendar/holidays [PT] -RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?projects/calendar/caldata/(.*)$ /b/$1media/caldata/$2 [PT] +# bug 885799, 952429 +RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?projects/calendar/holidays.html$ /$1projects/calendar/holidays/ [L,R=301] +RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?projects/calendar/holidays(/?)$ /b/$1projects/calendar/holidays$2 [PT] +# So that current subscriptions will continue to work +RewriteRule ^/projects/calendar/caldata/(.*)$ /media/caldata/$1 [PT] # bug 947890 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/latest/releasenotes(/?)$ /b/$1firefox/latest/releasenotes$2 [PT] @@ -680,8 +682,8 @@ RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?press/speakerrequest(/?)$ /b/$1press/speaker RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/aurora/up-to-date(/?)$ /b/$1firefox/aurora/up-to-date$2 [PT] # bug 971244 -RewriteRule ^/firefox/its-a-trap.html$ http://www.itisatrap.org/firefox/its-a-trap.html [L] -RewriteRule ^/firefox/its-an-attack.html$ http://www.itisatrap.org/firefox/its-an-attack.html [L] +RewriteRule ^/firefox/its-a-trap.html$ http://www.itisatrap.org/firefox/its-a-trap.html [L,R=301] +RewriteRule ^/firefox/its-an-attack.html$ http://www.itisatrap.org/firefox/its-an-attack.html [L,R=301] # bug 979217 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox(/(?:\d+\.\d+\.?(?:\d+)?\.?(?:\d+)?(?:[a|b]?)(?:\d*)(?:pre)?(?:\d)?))?/tour(/?)$ /b/$1firefox$2/tour$3 [PT]