From 83878ff3e3e4aee1a73bddee2d0c155b69153561 Mon Sep 17 00:00:00 2001 From: Jim Laney Date: Thu, 2 Nov 2023 12:31:12 -0700 Subject: [PATCH] email settings now in django-container --- Dockerfile | 2 +- docker/settings.py | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf43aab6..8a3704a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG DJANGO_CONTAINER_VERSION=1.4.1 +ARG DJANGO_CONTAINER_VERSION=1.4.2 FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} as app-container diff --git a/docker/settings.py b/docker/settings.py index d605c172..31b0e466 100644 --- a/docker/settings.py +++ b/docker/settings.py @@ -87,20 +87,7 @@ RESTCLIENTS_ADMIN_AUTH_MODULE = 'course_grader.views.support.can_proxy_restclient' PERSISTENT_MESSAGE_AUTH_MODULE = 'course_grader.views.support.can_manage_persistent_messages' -EMAIL_HOST = os.getenv('EMAIL_HOST') -EMAIL_PORT = 587 -EMAIL_TIMEOUT = 15 -EMAIL_USE_TLS = True -EMAIL_SSL_CERTFILE = os.getenv('CERT_PATH', '') -EMAIL_SSL_KEYFILE = os.getenv('KEY_PATH', '') - EMAIL_NOREPLY_ADDRESS = os.getenv('EMAIL_NOREPLY_ADDRESS') -if os.getenv('ENV', 'localdev') == 'prod': - EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -else: - EMAIL_BACKEND = 'saferecipient.EmailBackend' - SAFE_EMAIL_RECIPIENT = os.getenv('SAFE_EMAIL_RECIPIENT') - GRADEPAGE_HOST = 'https://' + os.getenv('CLUSTER_CNAME', 'localhost') SUBMISSION_DEADLINE_WARNING_HOURS = 41 GRADE_RETENTION_YEARS = 5