Merge pull request #5 from monty5811/remove_django_mailgun

remove django-mailgun
monty5811 · Oct 6, 2015 · 9d9c0c2 · 9d9c0c2
2 parents 82670ee + 5ee780a
commit 9d9c0c2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.env.example b/.env.example
@@ -2,8 +2,9 @@ SOCIAL_AUTH_GOOGLE_OAUTH2_KEY= # you get this by registering a web app here: cod
 SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET= # you get this by registering a web app here: code.google.com/apis/console
 SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS=example.com
 SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS=test@example.com
-MAILGUN_ACCESS_KEY= # you get this from mailgun, or use a dummy value
-MAILGUN_SERVER_NAME=test@example.com
+DJANGO_EMAIL_HOST=smtp.mailgun.org # for example
+DJANGO_EMAIL_HOST_USER=postmaster@example.com
+DJANGO_EMAIL_HOST_PASSWORD= # fill in
 ELVANTO_KEY= # you get this from elvanto, or use a dummy value
 TWILIO_ACCOUNT_SID= # you get this from twilio
 TWILIO_AUTH_TOKEN= # you get this from twilio

diff --git a/README.md b/README.md
@@ -25,7 +25,6 @@ In order to set up an instance of apostello you will need:
 
  - Twilio account and a purchased number.
  - Google account, preferably a Google Apps Domain. Currently all users log in with a Google account. A Google Apps domain can be white listed in the application settings. Alternatively individual Google accounts can also be white listed. Support for other login options is planned.
- - Mailgun account for email notifications. Support for alternatives is planned.
 
 ## Development
 

diff --git a/requirements.in b/requirements.in
@@ -10,7 +10,6 @@ django-compressor
 django-datetime-widget
 django-debug-toolbar
 django-extensions
-django-mailgun
 django-phonenumber-field
 django-solo
 django-twilio

diff --git a/requirements.txt b/requirements.txt
@@ -20,7 +20,6 @@ django-compressor==1.5
 django-datetime-widget==0.9.3
 django-debug-toolbar==1.3.2
 django-extensions==1.5.7
-django-mailgun==0.7.2
 django-phonenumber-field==0.7.2
 django-solo==1.1.0
 django-twilio==0.8.0
@@ -66,7 +65,7 @@ pytz==2015.6              # via celery, django-datetime-widget, twilio
 requests-oauthlib==0.5.0  # via python-social-auth
 requests==2.7.0
 simplegeneric==0.8.1      # via ipython
-six==1.9.0                # via django-appconf, django-extensions, django-mailgun, python-social-auth, twilio
+six==1.9.0                # via django-appconf, django-extensions, python-social-auth, twilio
 sqlparse==0.1.16          # via django-debug-toolbar
 traitlets==4.0.0          # via ipython
 twilio==4.6.0
diff --git a/settings/common.py b/settings/common.py
@@ -113,9 +113,11 @@
 }
 
 # email settings
-EMAIL_BACKEND = 'django_mailgun.MailgunBackend'
-MAILGUN_ACCESS_KEY = os.environ['MAILGUN_ACCESS_KEY']
-MAILGUN_SERVER_NAME = os.environ['MAILGUN_SERVER_NAME']
+EMAIL_USE_TLS = True
+EMAIL_HOST = os.environ.get('DJANGO_EMAIL_HOST', 'smtp.mailgun.org')
+EMAIL_HOST_USER = os.environ.get('DJANGO_EMAIL_HOST_USER', '')
+EMAIL_HOST_PASSWORD = os.environ.get('DJANGO_EMAIL_HOST_PASSWORD', '')
+EMAIL_PORT = 587
 
 # social login settings
 SOCIAL_AUTH_URL_NAMESPACE = 'social'