From fa1cd8b24ba2733162987e3fbd0c3518de751cb1 Mon Sep 17 00:00:00 2001 From: Sergey G Date: Fri, 12 Jan 2018 14:56:16 +0500 Subject: [PATCH] LIL-65 Replace custom `notification/email` => `django-anymail[mailgun]` --- notification/__init__.py | 0 notification/email.py | 12 ------------ project/config/__init__.py | 0 project/config/mailgun.py | 5 ----- project/settings.py | 13 ++++++++++++- requirements.txt | 2 +- 6 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 notification/__init__.py delete mode 100644 notification/email.py delete mode 100644 project/config/__init__.py delete mode 100644 project/config/mailgun.py diff --git a/notification/__init__.py b/notification/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/notification/email.py b/notification/email.py deleted file mode 100644 index 72dd108b..00000000 --- a/notification/email.py +++ /dev/null @@ -1,12 +0,0 @@ -import requests - -from django.conf import settings - - -def send_email(subject, text, to, sender=settings.MAILGUN_DEFAULT_FROM): - return requests.post(settings.MAILGUN_API_URL, - auth=("api", settings.MAILGUN_API_KEY), - data={"from": sender, - "to": to, - "subject": subject, - "text": text}) diff --git a/project/config/__init__.py b/project/config/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/project/config/mailgun.py b/project/config/mailgun.py deleted file mode 100644 index 59190e34..00000000 --- a/project/config/mailgun.py +++ /dev/null @@ -1,5 +0,0 @@ -# https://documentation.mailgun.com/ -MAILGUN_DOMAIN_NAME = "" -MAILGUN_API_KEY = "" -MAILGUN_DEFAULT_FROM = "" -MAILGUN_API_URL = f"https://api.mailgun.net/v3/{MAILGUN_DOMAIN_NAME}/messages" diff --git a/project/settings.py b/project/settings.py index 1379a18e..350a91ef 100644 --- a/project/settings.py +++ b/project/settings.py @@ -37,6 +37,8 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', +] + [ + 'anymail', ] + [ 'apps.auth.apps' ] @@ -121,4 +123,13 @@ USE_TZ = True STATIC_URL = '/static/' -from .config.mailgun import * + +# Email +# https://github.com/anymail/django-anymail + +ANYMAIL = { + "MAILGUN_API_KEY": "key-ec6af2d43d031d59bff6b1c8fb9390cb", + "MAILGUN_SENDER_DOMAIN": 'mail.9ev.ru', +} +EMAIL_BACKEND = "anymail.backends.mailgun.EmailBackend" +DEFAULT_FROM_EMAIL = "postmaster@mail.9ev.ru" diff --git a/requirements.txt b/requirements.txt index 67607a3d..686dab1f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ Django==2.0.1 -requests==2.18.4 \ No newline at end of file +django-anymail[mailgun]==1.2 \ No newline at end of file