From 66c6b817264ee446baa5e83ac2e4469b5b2352f3 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Wed, 16 Aug 2017 06:39:14 -0700 Subject: [PATCH 1/4] make footer text less redudndant --- pinaxcon/templates/_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinaxcon/templates/_footer.html b/pinaxcon/templates/_footer.html index a05b171..0c35e68 100644 --- a/pinaxcon/templates/_footer.html +++ b/pinaxcon/templates/_footer.html @@ -8,7 +8,7 @@
-

© 2017 North Bay Python, a member project of Software Freedom Conservancy, a 501(c)(3) charity.

+

© 2017 North Bay Python, member project of Software Freedom Conservancy, a 501(c)(3) charity.

Facebook From 6363b4a422dc45e707b03cedf7ee71b94d283d96 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Thu, 17 Aug 2017 08:16:09 -0700 Subject: [PATCH 2/4] Sets the admin e-mail address --- pinaxcon/settings.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index d568f71..6eaf3a2 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -34,6 +34,12 @@ ALLOWED_HOSTS = [".localhost", ".herokuapp.com", ".northbaypython.org"] TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles") +# Set the email address that will receive errors. +admin_email = os.environ.get("DJANGO_ADMIN_EMAIL", None) +if admin_email is not None: + ADMINS = ("Webmaster", admin_email) + + # Use SSLRedirectMiddleware SSL_ON = os.environ.get("DJANGO_SSL_ON", True) SSL_ALWAYS = os.environ.get("DJANGO_SSL_ALWAYS", False) From ce1e8dd6d710462ed2cd902e64b4a68da4f77199 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Thu, 17 Aug 2017 09:20:18 -0700 Subject: [PATCH 3/4] Makes 500 errors accept a RequestContext --- pinaxcon/urls.py | 5 ++++- pinaxcon/views.py | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pinaxcon/views.py diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 67671c1..6f454a8 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -5,9 +5,10 @@ from django.contrib.staticfiles.templatetags.staticfiles import static as _stati from django.views.generic import TemplateView from django.views.generic import RedirectView - from django.contrib import admin +from pinaxcon import views + import symposion.views @@ -78,3 +79,5 @@ urlpatterns = [ ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + +handler500 = views.server_error diff --git a/pinaxcon/views.py b/pinaxcon/views.py new file mode 100644 index 0000000..433e368 --- /dev/null +++ b/pinaxcon/views.py @@ -0,0 +1,9 @@ +from django.http import HttpResponseServerError +from django.template import RequestContext +from django.template import Template +from django.template.loader import get_template +from django.views import defaults + +def server_error(request, template_name=defaults.ERROR_500_TEMPLATE_NAME): + t = Template("{%% include '%s' %%}" % template_name) + return HttpResponseServerError(t.render(RequestContext(request))) From bb9ac9fd67cfae195171ba89af1818179700ab7d Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Thu, 17 Aug 2017 09:27:00 -0700 Subject: [PATCH 4/4] Adds a default e-mail setting --- pinaxcon/settings.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 6eaf3a2..5396a8c 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -24,6 +24,11 @@ DATABASES['default'].update(db_from_env) ALLOWED_HOSTS = [".localhost", ".herokuapp.com", ".northbaypython.org"] +# If DEFAULT_FROM_EMAIL is not set, email will most likely break in prod. +from_email = os.environ.get("DJANGO_DEFAULT_FROM_EMAIL", None) +if from_email is not None: + DEFAULT_FROM_EMAIL = from_email + # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems.