From 2ec89afac29c4428a023e69aebbe349358d4851b Mon Sep 17 00:00:00 2001 From: Son NK Date: Thu, 21 Nov 2019 16:22:27 +0100 Subject: [PATCH] add ADMIN_EMAIL and send notif to this email --- .env.example | 1 + app/config.py | 1 + app/email_utils.py | 4 ++-- tests/env.test | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index a998ed42..05ae50eb 100644 --- a/.env.example +++ b/.env.example @@ -9,6 +9,7 @@ ENABLE_SENTRY=true NOT_SEND_EMAIL=true EMAIL_DOMAIN=sl.local SUPPORT_EMAIL=support@sl.local +ADMIN_EMAIL=to_fill # Max number emails user can generate for free plan MAX_NB_EMAIL_FREE_PLAN=3 diff --git a/app/config.py b/app/config.py index 81ccf6d5..a2aaf2e5 100644 --- a/app/config.py +++ b/app/config.py @@ -39,6 +39,7 @@ ENABLE_SENTRY = "ENABLE_SENTRY" in os.environ NOT_SEND_EMAIL = "NOT_SEND_EMAIL" in os.environ EMAIL_DOMAIN = os.environ["EMAIL_DOMAIN"] SUPPORT_EMAIL = os.environ["SUPPORT_EMAIL"] +ADMIN_EMAIL = os.environ["ADMIN_EMAIL"] MAX_NB_EMAIL_FREE_PLAN = int(os.environ["MAX_NB_EMAIL_FREE_PLAN"]) POSTFIX_SERVER = "1.1.1.1" diff --git a/app/email_utils.py b/app/email_utils.py index 3645be71..ccc99c29 100644 --- a/app/email_utils.py +++ b/app/email_utils.py @@ -5,7 +5,7 @@ from smtplib import SMTP from jinja2 import Environment, FileSystemLoader -from app.config import SUPPORT_EMAIL, ROOT_DIR, POSTFIX_SERVER +from app.config import SUPPORT_EMAIL, ROOT_DIR, POSTFIX_SERVER, ADMIN_EMAIL from app.log import LOG @@ -117,4 +117,4 @@ def send_by_postfix(to_email, subject, plaintext, html): def notify_admin(subject, html_content=""): - send_by_postfix(SUPPORT_EMAIL, subject, html_content, html_content) + send_by_postfix(ADMIN_EMAIL, subject, html_content, html_content) diff --git a/tests/env.test b/tests/env.test index 097cba45..dbeecbad 100644 --- a/tests/env.test +++ b/tests/env.test @@ -9,6 +9,7 @@ URL=http://localhost NOT_SEND_EMAIL=true EMAIL_DOMAIN=sl.local SUPPORT_EMAIL=support@sl.local +ADMIN_EMAIL=to_fill # Max number emails user can generate for free plan MAX_NB_EMAIL_FREE_PLAN=3