website Changeset - 5fa226284bcb · Conservancy Kallithea

Changeset - 5fa226284bcb

Parent rev.

Child rev.

[Not reviewed]

1 7 0

Ben Sturmfels (bsturmfels) - 1 month ago 2024-03-20 03:54:54
ben@sturm.com.au

Delegate management of canonical URLs to Apache

This middleware is mostly redundant:

* redirecting to canonical URLs can be done more simply in Apache
* appending a forward slash is a default in CommonMiddleware now
* we're no longer using Squid cache

May need to update Apache to strip/redirect trailing "index.html".

8 files changed with 4 insertions and 85 deletions:

TODO.md

conservancy/blog/views.py

conservancy/local_context_processors.py

conservancy/middleware.py

conservancy/podjango/views.py

conservancy/settings/base.py

conservancy/settings/dev.py

conservancy/settings/prod.py

0 comments (0 inline, 0 general)

TODO.md

➞

Show inline comments

 # To-do
-* remove `ForceCanonicalHostnameMiddleware` by ensuring canonical redirect and HTTPS redirect is done by Apache
+* ask Denver about why so many license files
 * serve a 400 in Apache for a hostname we don't explicitly support
 * use `<detail>` elements for supporter page hidden sections, rather than complex jQuery - or consider Alpine.js
 * replace `internalNavigate` with inline flexbox layout
 * add tests for main pages returning 200
 # Done
 * remove `ForceCanonicalHostnameMiddleware` by ensuring canonical redirect and HTTPS redirect is done by Apache
 * standardise settings to replace `settings.py` and `djangocommonsettings.py`
   with `settings/prod.py` and move `SECRET_KEY` to an environment variable
 * migrate to Django 4.2 LTS
 * review `apache2` directory - may be unused
 * add deployment script that runs migrations and collects static files
 * switch `ParameterValidator` to use `SECRET_KEY` if possible to minimize

conservancy/blog/views.py

➞

Show inline comments

@@ ... / @@ -111,17 +111,14 @@ def query(request): @@
                          key=last_name)
         tags = EntryTag.objects.all().order_by('label')
         return render(request, 'blog/query.html', {'authors': authors, 'tags': tags})
 def relative_redirect(request, path):
     from django import http
     from django.conf import settings
     host = request.get_host()
     if settings.FORCE_CANONICAL_HOSTNAME:
         host = settings.FORCE_CANONICAL_HOSTNAME
     url = "{}://{}{}".format(request.is_secure() and 'https' or 'http', host, path)
     return http.HttpResponseRedirect(url)
 class BlogYearArchiveView(YearArchiveView):
     make_object_list = True

conservancy/local_context_processors.py

➞

Show inline comments

 from datetime import datetime as DateTime
 from django.conf import settings
 from .fundgoal.models import FundraisingGoal
 SITE_FUNDGOAL = 'cy2023-end-year-match'
 def fundgoal_lookup(fundraiser_sought):
     try:
@@ ... / @@ -16,13 +14,8 @@ def fundgoal_lookup(fundraiser_sought): @@
 def sitefundraiser(request):
     return {
         'datetime_now': DateTime.now(),
         'sitefundgoal': fundgoal_lookup(SITE_FUNDGOAL),
     }
 if settings.FORCE_CANONICAL_HOSTNAME:
     _HOST_URL_VAR = {'host_url': 'https://' + settings.FORCE_CANONICAL_HOSTNAME}
     def host_url(request):
         return _HOST_URL_VAR
 else:
     def host_url(request):
         return {'host_url': request.build_absolute_uri('/').rstrip('/')}
 def host_url(request):
     return {'host_url': request.build_absolute_uri('/').rstrip('/')}

conservancy/middleware.py

➞

Show inline comments

deleted file

conservancy/podjango/views.py

➞

Show inline comments

@@ ... / @@ -102,14 +102,11 @@ def query(request): @@
         tags = CastTag.objects.all().order_by('label')
         return render(request, 'podjango/cast/query.html', {'tags': tags})
 def relative_redirect(request, path):
     from django import http
     from django.conf import settings
     host = http.get_host(request)
     if settings.FORCE_CANONICAL_HOSTNAME:
         host = settings.FORCE_CANONICAL_HOSTNAME
     url = "%s://%s%s" % (request.is_secure() and 'https' or 'http', host, path)
     return http.HttpResponseRedirect(url)

conservancy/settings/base.py

➞

Show inline comments

@@ ... / @@ -19,16 +19,12 @@ @@
 from pathlib import Path
 SITE_ID = 2
 ROOT_URLCONF = 'conservancy.urls'
 REDIRECT_TABLE = {
     'www.sf-conservancy.org': 'sfconservancy.org',
+}
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
     'formatters': {
         'default': {
             'format': '%(asctime)s %(levelname)s %(name)s: %(message)s',
@@ ... / @@ -133,13 +129,12 @@ MEDIA_URL = '/media/' @@
 MIDDLEWARE = [
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'conservancy.middleware.ForceCanonicalHostnameMiddleware',
+]
 USETHESOURCE = {
     'SENDER': 'compliance@sfconservancy.org',
     'LIST_RECIPIENT': 'ccs-review@lists.sfconservancy.org',
+}

conservancy/settings/dev.py

➞

Show inline comments

 from .base import *
 DEBUG = True
 ALLOWED_HOSTS = ['*']
 FORCE_CANONICAL_HOSTNAME = False
 DATABASES = {
     'default': {
         'NAME': 'conservancy-website.sqlite3',
         'ENGINE': 'django.db.backends.sqlite3',
+    }
+}

conservancy/settings/prod.py

➞

Show inline comments

@@ ... / @@ -4,14 +4,12 @@ from django.core.exceptions import ImproperlyConfigured @@
 from .base import *
 DEBUG = False
 ALLOWED_HOSTS = ['www.sfconservancy.org', 'sfconservancy.org']
 FORCE_CANONICAL_HOSTNAME = 'sfconservancy.org'
 ADMINS = [
     ('Bradley M. Kuhn', 'sysadmin@sfconservancy.org'),
     ('Ben Sturmfels', 'sysadmin+conservancy@sturm.com.au'),
+]
 MANAGERS = [

0 comments (0 inline, 0 general)