Merge pull request #1505 from watchdogpolska/dev

v1.2.09
watchdogpolska · Apr 22, 2024 · 6d8b627 · 6d8b627
2 parents fbd1610 + 1ce6cee
commit 6d8b627
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 16 deletions.
diff --git a/.contrib/docker/Dockerfile.web.production b/.contrib/docker/Dockerfile.web.production
@@ -29,7 +29,6 @@ RUN ls -la
 RUN git status
 RUN export DJANGO_SETTINGS_MODULE="config.settings.production" && \
    export DJANGO_SECRET_KEY="fake_key" && \
-   export DJANGO_SERVER_EMAIL="fake_server" && \
    export RAVEN_DSN="https://examplePublicKey@o0.ingest.sentry.io/0" && \
    export CACHE_URL="locmemcache://" && \
    python manage.py collectstatic --noinput && \

diff --git a/config/settings/common.py b/config/settings/common.py
@@ -132,7 +132,7 @@
 )
 EMAIL_SUBJECT_PREFIX = env.str("DJANGO_EMAIL_SUBJECT_PREFIX", "[poradnia] ")
 EMAIL_USE_TLS = env.bool("DJANGO_EMAIL_USE_TLS", True)
-SERVER_EMAIL = EMAIL_HOST_USER
+SERVER_EMAIL = env.str("DJANGO_SERVER_EMAIL", "")
 # END EMAIL
 
 # MANAGER CONFIGURATION

diff --git a/config/settings/production.py b/config/settings/production.py
@@ -12,18 +12,6 @@
 SECRET_KEY = env.str("DJANGO_SECRET_KEY")
 # END SECRET KEY
 
-# EMAIL
-DEFAULT_FROM_EMAIL = env.str(
-    "DJANGO_DEFAULT_FROM_EMAIL", "poradnia <noreply@porady.siecobywatelska.pl>"
-)
-EMAIL_SUBJECT_PREFIX = env.str("DJANGO_EMAIL_SUBJECT_PREFIX", "[poradnia] ")
-
-EMAIL_CONFIG = env.email_url("EMAIL_URL", default="smtp://localhost:25")
-vars().update(EMAIL_CONFIG)
-
-SERVER_EMAIL = env.str("DJANGO_SERVER_EMAIL")
-# END EMAIL
-
 # TEMPLATE CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
 TEMPLATES[0]["OPTIONS"]["loaders"] = (

diff --git a/poradnia/__init__.py b/poradnia/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.2.08"
+__version__ = "1.2.09"
 
 
 # Compatibility to eg. django-rest-framework

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -34,7 +34,7 @@ lxml==5.2.1
 cssselect==1.2.0
 # Your custom requirements go here
 django-guardian==2.4.0
-django-mailbox==4.10.0
+django-mailbox==4.10.1
 django-filter==24.2
 # django-ajax-datatable to be installed from github fork until
 # https://github.com/morlandi/django-ajax-datatable/pull/111 is merged