From ca326667f531bae3bf0980676f4e772525e9bd22 Mon Sep 17 00:00:00 2001 From: esensar Date: Mon, 22 Oct 2018 19:47:38 +0200 Subject: [PATCH 1/5] Revert "Disable SSL for mailer" This reverts commit 13fb74e43dda2ed707ac352dc70b4b7608434c43. --- config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index 97b0e10..305ae30 100644 --- a/config.py +++ b/config.py @@ -2,7 +2,7 @@ import os # App configuration DEBUG = os.environ['DEBUG'] -APP_VERSION = '0.2.3' +APP_VERSION = '0.2.2' # Define the application directory BASE_DIR = os.path.abspath(os.path.dirname(__file__)) @@ -47,7 +47,7 @@ SMTP_PASSWORD = os.environ['MAILGUN_SMTP_PASSWORD'] MAIL_SERVER = os.environ['MAILGUN_SMTP_SERVER'] MAIL_PORT = os.environ['MAILGUN_SMTP_PORT'] MAIL_USE_TLS = True -MAIL_USE_SSL = False +MAIL_USE_SSL = True MAIL_DEBUG = False # gmail authentication From 11600d0cdd4d142e0673ed272514188e19f88dbe Mon Sep 17 00:00:00 2001 From: esensar Date: Mon, 22 Oct 2018 19:47:41 +0200 Subject: [PATCH 2/5] Revert "Clean up config.py" This reverts commit 75ebd7aaae503721a685fbf45bcbf160eaadd4a2. --- config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index 305ae30..cc5de29 100644 --- a/config.py +++ b/config.py @@ -42,8 +42,6 @@ CELERY_BROKER_URL = os.environ['REDIS_URL'] CELERY_RESULT_BACKEND = os.environ['REDIS_URL'] # Mailer config -SMTP_LOGIN = os.environ['MAILGUN_SMTP_LOGIN'] -SMTP_PASSWORD = os.environ['MAILGUN_SMTP_PASSWORD'] MAIL_SERVER = os.environ['MAILGUN_SMTP_SERVER'] MAIL_PORT = os.environ['MAILGUN_SMTP_PORT'] MAIL_USE_TLS = True @@ -53,6 +51,8 @@ MAIL_DEBUG = False # gmail authentication MAIL_USERNAME = os.environ['MAILGUN_SMTP_LOGIN'] MAIL_PASSWORD = os.environ['MAILGUN_SMTP_PASSWORD'] +SMTP_LOGIN = os.environ['MAILGUN_SMTP_LOGIN'] +SMTP_PASSWORD = os.environ['MAILGUN_SMTP_PASSWORD'] # mail accounts MAIL_DEFAULT_SENDER = 'final.iot.backend.mailer@gmail.com' From fd398dfb7f6c04c89e8e2351f3b2f27d240752c7 Mon Sep 17 00:00:00 2001 From: esensar Date: Mon, 22 Oct 2018 19:47:43 +0200 Subject: [PATCH 3/5] Revert "Add smtp login and password to config" This reverts commit a47a3ddc7c72486afd401b695983fb6bd2ddb8b0. --- config.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/config.py b/config.py index cc5de29..725d035 100644 --- a/config.py +++ b/config.py @@ -44,15 +44,13 @@ CELERY_RESULT_BACKEND = os.environ['REDIS_URL'] # Mailer config MAIL_SERVER = os.environ['MAILGUN_SMTP_SERVER'] MAIL_PORT = os.environ['MAILGUN_SMTP_PORT'] -MAIL_USE_TLS = True +MAIL_USE_TLS = False MAIL_USE_SSL = True MAIL_DEBUG = False # gmail authentication MAIL_USERNAME = os.environ['MAILGUN_SMTP_LOGIN'] MAIL_PASSWORD = os.environ['MAILGUN_SMTP_PASSWORD'] -SMTP_LOGIN = os.environ['MAILGUN_SMTP_LOGIN'] -SMTP_PASSWORD = os.environ['MAILGUN_SMTP_PASSWORD'] # mail accounts MAIL_DEFAULT_SENDER = 'final.iot.backend.mailer@gmail.com' From 2c369d6208fb9b32e94da79618b9bf15d5d0608b Mon Sep 17 00:00:00 2001 From: esensar Date: Mon, 22 Oct 2018 19:47:44 +0200 Subject: [PATCH 4/5] Revert "Prepare config for mailgun" This reverts commit eb6b3ec34e009e496863f194bd044a20701e0d27. --- .env | 4 ---- config.py | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.env b/.env index 35cca0a..0b46463 100644 --- a/.env +++ b/.env @@ -6,7 +6,3 @@ MQTT_CLIENT=local APP_MAIL_USERNAME=final.iot.backend.mailer@gmail.com APP_MAIL_PASSWORD=FinalIoT1234 FLASK_ENV=development -MAILGUN_SMTP_SERVER=smtp.googlemail.com -MAILGUN_SMPT_PORT=465 -MAILGUN_SMPT_LOGIN=final.iot.backend.mailer@gmail.com -MAILGUN_SMPT_PASSWORD=FinalIoT1234 diff --git a/config.py b/config.py index 725d035..f084368 100644 --- a/config.py +++ b/config.py @@ -42,15 +42,15 @@ CELERY_BROKER_URL = os.environ['REDIS_URL'] CELERY_RESULT_BACKEND = os.environ['REDIS_URL'] # Mailer config -MAIL_SERVER = os.environ['MAILGUN_SMTP_SERVER'] -MAIL_PORT = os.environ['MAILGUN_SMTP_PORT'] +MAIL_SERVER = 'smtp.googlemail.com' +MAIL_PORT = 465 MAIL_USE_TLS = False MAIL_USE_SSL = True MAIL_DEBUG = False # gmail authentication -MAIL_USERNAME = os.environ['MAILGUN_SMTP_LOGIN'] -MAIL_PASSWORD = os.environ['MAILGUN_SMTP_PASSWORD'] +MAIL_USERNAME = os.environ['APP_MAIL_USERNAME'] +MAIL_PASSWORD = os.environ['APP_MAIL_PASSWORD'] # mail accounts MAIL_DEFAULT_SENDER = 'final.iot.backend.mailer@gmail.com' From a7f5de7a38dfc5ebd35e74c70cd09a73629fe4f5 Mon Sep 17 00:00:00 2001 From: esensar Date: Mon, 22 Oct 2018 19:48:11 +0200 Subject: [PATCH 5/5] Bump to 0.2.4 --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index f084368..348fd6d 100644 --- a/config.py +++ b/config.py @@ -2,7 +2,7 @@ import os # App configuration DEBUG = os.environ['DEBUG'] -APP_VERSION = '0.2.2' +APP_VERSION = '0.2.4' # Define the application directory BASE_DIR = os.path.abspath(os.path.dirname(__file__))