From 043555b43d0e55a39215f52904d3a7347595c58b Mon Sep 17 00:00:00 2001 From: Michael Karamuth Date: Fri, 22 Nov 2019 23:12:01 +0400 Subject: [PATCH] Allow user to choose email provider --- cookiecutter.json | 20 ++++--------------- .../config/settings/production.py | 2 +- .../requirements/production.txt | 2 +- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/cookiecutter.json b/cookiecutter.json index d6d217ca4..38e0df0c8 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -17,22 +17,10 @@ "windows": "n", "use_pycharm": "n", "use_docker": "n", - "postgresql_version": [ - "11.3", - "10.8", - "9.6", - "9.5", - "9.4" - ], - "js_task_runner": [ - "None", - "Gulp" - ], - "cloud_provider": [ - "AWS", - "GCP", - "None" - ], + "postgresql_version": ["11.3", "10.8", "9.6", "9.5", "9.4"], + "js_task_runner": ["None", "Gulp"], + "cloud_provider": ["AWS", "GCP", "None"], + "email_provider": ["SES", "Mailgun"], "custom_bootstrap_compilation": "n", "use_compressor": "n", "use_celery": "n", diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index ab9400404..be86b9f30 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -186,7 +186,7 @@ ADMIN_URL = env("DJANGO_ADMIN_URL") # ------------------------------------------------------------------------------ # https://anymail.readthedocs.io/en/stable/installation/#installing-anymail INSTALLED_APPS += ["anymail"] # noqa F405 -{%- if cookiecutter.cloud_provider == 'AWS' %} +{%- if cookiecutter.email_provider == 'SES' %} # Use boto3 credentials # https://boto3.amazonaws.com/v1/documentation/api/latest/guide/configuration.html#configuring-credentials EMAIL_BACKEND = "anymail.backends.amazon_ses.EmailBackend" diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index a07d592c3..78c5bc862 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -19,7 +19,7 @@ django-storages[boto3]==1.8 # https://github.com/jschneier/django-storages django-storages[google]==1.8 # https://github.com/jschneier/django-storages {%- endif %} -{%- if cookiecutter.cloud_provider == 'AWS' %} +{%- if cookiecutter.email_provider == 'SES' %} django-anymail[amazon_ses]==7.0.0 # https://github.com/anymail/django-anymail {%- else %} django-anymail[mailgun]==7.0.0 # https://github.com/anymail/django-anymail