Redirect several URLs at the router level.

1 files changed, 8 insertions, 6 deletions

diff --git a/urls.py b/urls.py
index 506b83ef..e7a2cbc3 100644
--- a/urls.py
+++ b/urls.py
@@ -25,14 +25,16 @@ urlpatterns += patterns('public.views',
     (r'^$', 'index', {}, 'index'),
     (r'^about/$', TemplateView.as_view(template_name='public/about.html'),
         {}, 'page-about'),
+    ('^art/$', RedirectView.as_view('https://projects.parabola.nu/artwork.git/'),
+        {}, 'page-art'),
     (r'^https/$', TemplateView.as_view(template_name='public/https.html'),
         {}, 'page-https'),
-    (r'^art/$',   TemplateView.as_view(template_name='public/art.html'),
-        {}, 'page-art'),
     (r'^hackers/$',      'userlist', { 'user_type':'hackers' }, 'page-devs'),
     (r'^fellows/$',      'userlist', { 'user_type':'fellows' }, 'page-fellows'),
-    (r'^donate/$',       'donate',   {}, 'page-donate'),
-    (r'^download/$',     'download', {}, 'page-download'),
+    (r'^donate/$', RedirectView.as_view('https://wiki.parabola.nu/Donations'),
+        {}, 'page-donate'),
+    (r'^download/$', RedirectView.as_view('https://wiki.parabola.nu/Get_Parabola'),
+        {}, 'page-download'),
     (r'^master-keys/$',  'keys',     {}, 'page-keys'),
     (r'^master-keys/json/$', 'keys_json', {}, 'pgp-keys-json'),
 )
@@ -109,8 +111,8 @@ legacy_urls = (
     ('^docs/',
         'https://wiki.parabola.nu/'),
 
-	('^developers/$',   '/hackers/'),
-	('^trustedusers/$',   '/hackers/'),
+    ('^developers/$',   '/hackers/'),
+    ('^trustedusers/$', '/hackers/'),
 )
 
 urlpatterns += [url(old_url, RedirectView.as_view(url=new_url))