Skip to content

Commit

Permalink
Merge pull request #24 from unlimitedlabs/email_settings
Browse files Browse the repository at this point in the history
Adds default settings for email.
  • Loading branch information
thisisdhaas committed Sep 24, 2015
2 parents b646500 + 26de7be commit 6bb78cb
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions example_project/example_project/orchestra_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ def setup_orchestra(settings_module_name):
# Currently disabled.
settings.ORCHESTRA_MAX_IN_PROGRESS_TASKS = 3

# Notification-specific email for message bundling and searching
settings.ORCHESTRA_NOTIFICATIONS_FROM_EMAIL = (
'Orchestra <noreply@example.org>')

# S3 bucket name to upload images to
settings.EDITOR_IMAGE_BUCKET_NAME = 'CHANGEME'

Expand Down Expand Up @@ -125,6 +121,24 @@ def setup_orchestra(settings_module_name):
settings.BEANSTALK_DISPATCH_TABLE = {
'machine_task_executor': ('orchestra.machine_tasks', 'execute')}

# Email and Notifications
#########################

# For registration to work, an email backend must be configured.
# This file defaults to printing emails to the console if there is no email
# backend configured already, but that should be changed in production.
settings.EMAIL_BACKEND = getattr(
settings,
'EMAIL_BACKEND',
'django.core.mail.backends.console.EmailBackend')
settings.DEFAULT_FROM_EMAIL = getattr(
settings,
'DEFAULT_FROM_EMAIL',
'Orchestra <noreply@example.org>')

# Notification-specific email for message bundling and searching
settings.ORCHESTRA_NOTIFICATIONS_FROM_EMAIL = settings.DEFAULT_FROM_EMAIL

# 3rd Party Integrations
#########################

Expand Down

0 comments on commit 6bb78cb

Please sign in to comment.