Merge tag 'release_2012-04-02'

Signing page changes, other tweaks

Conflicts:
	README
	local_settings.py.example
	requirements_prod.txt
	urls.py

1 files changed, 12 insertions, 4 deletions

diff --git a/urls.py b/urls.py
index d7b3be9b..2ac8271e 100644
--- a/urls.py
+++ b/urls.py
@@ -93,9 +93,17 @@ urlpatterns += patterns('',
     (r'^todolists/$','todolists.views.public_list'),
 )
 
-if settings.DEBUG == True:
-    urlpatterns += patterns('',
-        (r'^media/(.*)$', 'django.views.static.serve',
-            {'document_root': os.path.join(settings.DEPLOY_PATH, 'media')}))
+legacy_urls = (
+    ('^about.php',     '/about/'),
+    ('^changelog.php', '/packages/?sort=-last_update'),
+    ('^download.php',  '/download/'),
+    ('^index.php',     '/'),
+    ('^logos.php',     '/art/'),
+    ('^news.php',      '/news/'),
+)
+
+for old_url, new_url in legacy_urls:
+    urlpatterns += patterns('django.views.generic.simple',
+            (old_url, 'redirect_to', {'url': new_url}))
 
 # vim: set ts=4 sw=4 et: