Merged in develop (pull request #17)

Prepare config for mailgun
master
Ensar Sarajcic 2018-10-17 21:07:11 +00:00
commit f18f0a6c73
2 changed files with 8 additions and 4 deletions

4
.env
View File

@ -6,3 +6,7 @@ MQTT_CLIENT=local
APP_MAIL_USERNAME=final.iot.backend.mailer@gmail.com APP_MAIL_USERNAME=final.iot.backend.mailer@gmail.com
APP_MAIL_PASSWORD=FinalIoT1234 APP_MAIL_PASSWORD=FinalIoT1234
FLASK_ENV=development 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

View File

@ -42,15 +42,15 @@ CELERY_BROKER_URL = os.environ['REDIS_URL']
CELERY_RESULT_BACKEND = os.environ['REDIS_URL'] CELERY_RESULT_BACKEND = os.environ['REDIS_URL']
# Mailer config # Mailer config
MAIL_SERVER = 'smtp.googlemail.com' MAIL_SERVER = os.environ['MAILGUN_SMTP_SERVER']
MAIL_PORT = 465 MAIL_PORT = os.environ['MAILGUN_SMTP_PORT']
MAIL_USE_TLS = False MAIL_USE_TLS = False
MAIL_USE_SSL = True MAIL_USE_SSL = True
MAIL_DEBUG = False MAIL_DEBUG = False
# gmail authentication # gmail authentication
MAIL_USERNAME = os.environ['APP_MAIL_USERNAME'] MAIL_USERNAME = os.environ['MAILGUN_SMTP_LOGIN']
MAIL_PASSWORD = os.environ['APP_MAIL_PASSWORD'] MAIL_PASSWORD = os.environ['MAILGUN_SMTP_PASSWORD']
# mail accounts # mail accounts
MAIL_DEFAULT_SENDER = 'final.iot.backend.mailer@gmail.com' MAIL_DEFAULT_SENDER = 'final.iot.backend.mailer@gmail.com'