From f35cc3c821eeeb11cf3bd61d60aded5d39684d45 Mon Sep 17 00:00:00 2001 From: Dmitriy Shesterkin Date: Mon, 8 May 2017 23:51:59 +0300 Subject: [PATCH] callback settings --- conf/env.template | 7 +++++-- src/dokumentor/settings/base.py | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/conf/env.template b/conf/env.template index d221873..bd0ccc7 100644 --- a/conf/env.template +++ b/conf/env.template @@ -12,5 +12,8 @@ DJANGO_EMAIL_PASSWORD='' DJANGO_EMAIL_USE_TLS=False DJANGO_EMAIL_USE_SSL=False -CELERY_BROKER_URL = 'amqp://guest:guest@localhost:5672//' -CELERY_RESULT_BACKEND = 'amqp://guest:guest@localhost:5672//' +CELERY_BROKER_URL='amqp://guest:guest@localhost:5672//' +CELERY_RESULT_BACKEND='amqp://guest:guest@localhost:5672//' + +CALLBACK_EMAIL_SENDER='' +CALLBACK_MANAGERS_EMAILS=[] diff --git a/src/dokumentor/settings/base.py b/src/dokumentor/settings/base.py index 0559d83..dca1b52 100644 --- a/src/dokumentor/settings/base.py +++ b/src/dokumentor/settings/base.py @@ -261,9 +261,9 @@ CELERY_RESULT_BACKEND = e.get('CELERY_RESULT_BACKEND') CELERY_TIMEZONE = 'Europe/Moscow' CALLBACK_SETTINGS = { - 'EMAIL_SENDER': '!DEFINE', - 'MANAGERS_EMAILS': ['!DEFINE'], - 'NEW_REQ_AVAIL_EMAIL_SUBJ': u'Вопрос', + 'EMAIL_SENDER': e.get('CALLBACK_EMAIL_SENDER'), + 'MANAGERS_EMAILS': e.get('CALLBACK_MANAGERS_EMAILS'), + 'NEW_REQ_AVAIL_EMAIL_SUBJ': u'Вопрос техподдержке', } CELERYBEAT_SCHEDULE = {