Merged in develop (pull request #21)

Version 0.2.4 release
master
Ensar Sarajcic 2018-10-22 17:48:59 +00:00
commit 45750f8ec6
2 changed files with 7 additions and 13 deletions

4
.env
View File

@ -6,7 +6,3 @@ 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

@ -2,7 +2,7 @@ import os
# App configuration # App configuration
DEBUG = os.environ['DEBUG'] DEBUG = os.environ['DEBUG']
APP_VERSION = '0.2.3' APP_VERSION = '0.2.4'
# Define the application directory # Define the application directory
BASE_DIR = os.path.abspath(os.path.dirname(__file__)) BASE_DIR = os.path.abspath(os.path.dirname(__file__))
@ -42,17 +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
SMTP_LOGIN = os.environ['MAILGUN_SMTP_LOGIN'] MAIL_SERVER = 'smtp.googlemail.com'
SMTP_PASSWORD = os.environ['MAILGUN_SMTP_PASSWORD'] MAIL_PORT = 465
MAIL_SERVER = os.environ['MAILGUN_SMTP_SERVER'] MAIL_USE_TLS = False
MAIL_PORT = os.environ['MAILGUN_SMTP_PORT'] MAIL_USE_SSL = True
MAIL_USE_TLS = True
MAIL_USE_SSL = False
MAIL_DEBUG = False MAIL_DEBUG = False
# gmail authentication # gmail authentication
MAIL_USERNAME = os.environ['MAILGUN_SMTP_LOGIN'] MAIL_USERNAME = os.environ['APP_MAIL_USERNAME']
MAIL_PASSWORD = os.environ['MAILGUN_SMTP_PASSWORD'] MAIL_PASSWORD = os.environ['APP_MAIL_PASSWORD']
# mail accounts # mail accounts
MAIL_DEFAULT_SENDER = 'final.iot.backend.mailer@gmail.com' MAIL_DEFAULT_SENDER = 'final.iot.backend.mailer@gmail.com'