Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Add Mandrill #2313

Merged
merged 2 commits into from
Apr 22, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configure-aspen.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
env = website.env = gittip.wireup.env()
gittip.wireup.canonical(env)
website.db = gittip.wireup.db(env)
website.mail = gittip.wireup.mail(env)
gittip.wireup.billing(env)
gittip.wireup.username_restrictions(website)
gittip.wireup.nanswers(env)
Expand Down
2 changes: 2 additions & 0 deletions defaults.env
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,5 @@ ASPEN_NETWORK_ADDRESS=:8537
ASPEN_PROJECT_ROOT=.
ASPEN_SHOW_TRACEBACKS=yes
ASPEN_WWW_ROOT=www/

MANDRILL_KEY=
6 changes: 6 additions & 0 deletions gittip/wireup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import gittip
import raven
import stripe
import mandrill
from environment import Environment, is_yesish
from gittip.elsewhere import PlatformRegistry
from gittip.elsewhere.bitbucket import Bitbucket
Expand Down Expand Up @@ -40,6 +41,10 @@ def db(env):

return db

def mail(env):
mandrill_client = mandrill.Mandrill(env.mandrill_key)

return mandrill_client

def billing(env):
stripe.api_key = env.stripe_secret_api_key
Expand Down Expand Up @@ -262,6 +267,7 @@ def env():
SENTRY_DSN = unicode,
LOG_BUSY_THREADS_EVERY = int,
LOG_METRICS = is_yesish,
MANDRILL_KEY = unicode,
)


Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@

./vendor/invoke-0.7.0.tar.gz

./vendor/mandrill-1.0.53.tar.gz
Binary file added vendor/mandrill-1.0.53.tar.gz
Binary file not shown.