From 1871abd7e912deeb822992f40183b1b6b93d9cbc Mon Sep 17 00:00:00 2001 From: shireenrao Date: Mon, 26 Jun 2017 15:21:32 -0400 Subject: [PATCH] Setting up new project with mailhog without docker breaks use of mailhog (#553) * add mailhog container for local development * update local settings to use mailhog container for docker * remove whitespace * remove whitespace * fix whitespace formatting * another try to fix whitespace * fix block error due to whitespace * only use mailhog in docker if docker and mailhog is chosen in setup wizard * Remove warning at end if using docker and mailhog * mailhog should work locally without docker * remove unnecessary check for docker in dev docker-compose file * Remove section within local development docs referencing docker As this document is meant as a how to for developing locally, I removed the section which was added for using mailhog in docker. I will add that section to the developing-locally-docker.rst file. Also removed jinja template as it does not work in docs. * Added a comment on mailhog for local docker development * fix hyperlink to #smtp-backend * Added a comment on mailhog for local docker development * pull docs/developing-locally-docker.rst from upstream * remove changes from dev.yml and add comment for local.py * Sync with pydanny:master --- {{cookiecutter.project_slug}}/config/settings/local.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index ff21678c..efbaf30b 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -4,6 +4,8 @@ Local settings - Run in Debug mode {% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' %} - Use mailhog for emails +{% elif cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %} +- Use mailhog for emails {% else %} - Use console backend for emails {% endif %} @@ -30,6 +32,8 @@ SECRET_KEY = env('DJANGO_SECRET_KEY', default='CHANGEME!!!') EMAIL_PORT = 1025 {% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' %} EMAIL_HOST = env('EMAIL_HOST', default='mailhog') +{% elif cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %} +EMAIL_HOST = 'localhost' {% else %} EMAIL_HOST = 'localhost' EMAIL_BACKEND = env('DJANGO_EMAIL_BACKEND',