Skip to content
Permalink
Browse files
Mandrill is going down
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Mar 8, 2016
1 parent d3ca86e commit 2a885b5c9c116d6dbf711782ff8002cf26e4dab5
Showing with 3 additions and 6 deletions.
  1. +2 −3 nikolausers/settings.py
  2. +0 −2 requirements.txt
  3. +1 −1 sites/views.py
@@ -27,9 +27,8 @@

ALLOWED_HOSTS = ['*']

MANDRILL_API_KEY = os.environ['MANDRILL_APIKEY']
EMAIL_BACKEND = "djrill.mail.backends.djrill.DjrillBackend"
DEFAULT_FROM_EMAIL = "users@getnikola.com"
EMAIL_HOST = 'localhost'
DEFAULT_FROM_EMAIL = "nikola-users@chriswarrick.com"
import newrelic.agent
newrelic.agent.initialize()

@@ -1,6 +1,4 @@
Django==1.8.7
djrill==2.0
mandrill==1.0.57
newrelic==2.58.2.45
psycopg2==2.6.1
pytz==2015.7
@@ -123,7 +123,7 @@ def add(request):
send_mail("Nikola Users addition request for {0}".format(site.url),
'{0} <{1}> has requested addition of "{2}" <{3}> to the Nikola Users site.\nPlease visit the admin panel to accept or reject it: https://users.getnikola.com/admin/'.format(
site.author, site.email, site.title, site.url),
'noreply@getnikola.com', ['users@getnikola.com'], fail_silently=False)
'nikola-users@chriswarrick.com', ['users@getnikola.com'], fail_silently=False)

return render(request, 'add-ack.html', context)
else:

0 comments on commit 2a885b5

Please sign in to comment.