From 33912529d7f65b88ff38cacee9f37a279be79334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Marti=CC=81n?= Date: Mon, 26 Jan 2015 14:35:21 +0100 Subject: [PATCH] Added django-mailgun for mailing --- config/requirements.txt | 3 +++ shelfzilla/settings/base.py | 3 ++- shelfzilla/settings/local.py | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config/requirements.txt b/config/requirements.txt index 92200d8..4a18675 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -9,6 +9,9 @@ django-import-export==0.2.6 # Fixes +# Mailing +django-mailgun==0.2.2 + # Statics django-compressor==1.4 diff --git a/shelfzilla/settings/base.py b/shelfzilla/settings/base.py index 9aec081..73c01ff 100644 --- a/shelfzilla/settings/base.py +++ b/shelfzilla/settings/base.py @@ -65,7 +65,8 @@ INSTALLED_APPS = ( 'shelfzilla.apps._admin', 'shelfzilla.apps.config', 'shelfzilla.apps.homepage', - 'shelfzilla.apps.landing', + # 'shelfzilla.apps.landing', + 'shelfzilla.apps.mailing', 'shelfzilla.apps.manga', 'shelfzilla.apps.blog', 'shelfzilla.apps.pjax', diff --git a/shelfzilla/settings/local.py b/shelfzilla/settings/local.py index 76fba99..13e86bd 100644 --- a/shelfzilla/settings/local.py +++ b/shelfzilla/settings/local.py @@ -30,3 +30,8 @@ FILER_DUMP_PAYLOAD = True MEDIA_URL = '/media/' STATIC_URL = '/static/' + +EMAIL_BACKEND = 'django_mailgun.MailgunBackend' +MAILGUN_ACCESS_KEY = 'key-fdfc57f2bfb35a4ba5f9c1e3c30af373' +MAILGUN_SERVER_NAME = 'sandbox2dd21e486d144dc59742738b15e494ee.mailgun.org' +FROM_EMAIL = 'info@shelfzilla.com'