From 1d024b261ed91cde729e690fc926bd7107a3deb4 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Fri, 12 Oct 2018 13:53:59 +0200
Subject: [PATCH] Retire some legacy URL redirects

Some of this goes back to the old website, and some goes back even
further. Clean some up, leave those that are still clearly in use.
---
 pgweb/legacyurl/views.py | 17 -----------------
 pgweb/urls.py            | 19 +++----------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/pgweb/legacyurl/views.py b/pgweb/legacyurl/views.py
index d85da0f4..1a7823b2 100644
--- a/pgweb/legacyurl/views.py
+++ b/pgweb/legacyurl/views.py
@@ -1,22 +1,5 @@
 from django.http import HttpResponseRedirect
 
-def presskit(request, version, language):
-	return HttpResponseRedirect("/about/press/presskit%s/%s/" % (
-		version, language)
-	)
-
-def news(request, newsid):
-	return HttpResponseRedirect("/about/news/%s/" % newsid)
-
-def event(request, eventid):
-	return HttpResponseRedirect("/about/event/%s/" % eventid)
-
-def signup(request):
-	return HttpResponseRedirect("/account/signup/")
-
-def html_extension(request, prior_to_html):
-	return HttpResponseRedirect("/%s" % prior_to_html)
-
 def mailpref(request, listname):
 	# Just redirect to the homepage of pglister, don't try specific lists
 	return HttpResponseRedirect("https://lists.postgresql.org/")
diff --git a/pgweb/urls.py b/pgweb/urls.py
index 93d01f13..f8369b61 100644
--- a/pgweb/urls.py
+++ b/pgweb/urls.py
@@ -112,28 +112,18 @@ urlpatterns = [
 	url(r'^downloads/$', RedirectView.as_view(url='/download/', permanent=True)),
 
 	###
-	# Legacy URLs from the old website, that are likely to be used from other
-	# sites or press releases or such
+	# Legacy URLs from old structurs, but used in places like press releases
+	# so needs to live a bit longer.
 	###
 	url(r'^about/press/contact/$', RedirectView.as_view(url='/about/press/', permanent=True)),
-	url(r'^about/press/presskit(\d+)\.html\.(\w+)$', pgweb.legacyurl.views.presskit),
-	url(r'^about/news\.(\d+)$', pgweb.legacyurl.views.news),
-	url(r'^about/event\.(\d+)$', pgweb.legacyurl.views.event),
-	url(r'^community/signup', pgweb.legacyurl.views.signup),
 
 	###
 	# Images that are used from other community sites
 	###
 	url(r'^layout/images/(?P<f>[a-z0-9_\.]+)$', RedirectView.as_view(url='/media/img/layout/%(f)s', permanent=True)),
 	###
-	# These URLs were legacy even on the old site...
+	# Handle redirect on incorrect spelling of licence
 	###
-	url(r'^developer/sourcecode/$', RedirectView.as_view(url='/developer/coding/', permanent=True)),
-	url(r'^developer/bios/$', RedirectView.as_view(url='/community/contributors/', permanent=True)),
-	url(r'^docs/techdocs.*', RedirectView.as_view(url='https://wiki.postgresql.org/', permanent=True)),
-	url(r'^docs/faqs.FAQ.html$', RedirectView.as_view(url='https://wiki.postgresql.org/wiki/FAQ', permanent=True)),
-	url(r'^docs/faqs.FAQ_DEV.*', RedirectView.as_view(url='https://wiki.postgresql.org/wiki/Development_information', permanent=True)),
-	url(r'^docs/faqs.TODO.*', RedirectView.as_view(url='https://wiki.postgresql.org/wiki/Todo', permanent=True)),
 	url(r'^about/license/$', RedirectView.as_view(url='/about/licence', permanent=True)),
 
 	###
@@ -163,9 +153,6 @@ urlpatterns = [
 	# Crash testing URL :-)
 	url(r'^crashtest/$', pgweb.misc.views.crashtest),
 
-	# If we're getting an attempt for something ending in HTML, just get rid of it
-	url(r'^(.*)\.html$', pgweb.legacyurl.views.html_extension),
-
 	# Fallback for static pages, must be at the bottom
 	url(r'^(.*)/$', pgweb.core.views.fallback),
 ]