diff --git a/.#config.yaml b/.#config.yaml deleted file mode 120000 index b90ba2a6..00000000 --- a/.#config.yaml +++ /dev/null @@ -1 +0,0 @@ -sander@rowsandall-2.14384:1749892836 \ No newline at end of file diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index c079cfb7..00653b67 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -85,6 +85,7 @@ INSTALLED_APPS = [ 'taggit', 'boatmovers', 'django_recaptcha', + 'anymail', ] AUTHENTICATION_BACKENDS = ( @@ -446,22 +447,28 @@ CACHE_MIDDLEWARE_SECONDS = 900 # EMAIL_USE_TLS = CFG['email_use_tls'] # DEFAULT_FROM_EMAIL = 'admin@rowsandall.com' -EMAIL_BACKEND = 'django_ses.SESBackend' +#EMAIL_BACKEND = 'django_ses.SESBackend' -AWS_SES_REGION_NAME = CFG['aws_region'] -AWS_SES_REGION_ENDPOINT = CFG['aws_smtp'] +ANYMAIL = { + 'MAILERSEND_API_TOKEN': CFG['mailersend_api_key'], + } +EMAIL_BACKEND = 'anymail.backends.mailersend.EmailBackend' -AWS_SES_ACCESS_KEY_ID = CFG['aws_access_key_id'] -AWS_SES_SECRET_ACCESS_KEY = CFG['aws_secret_access_key'] -AWS_ACCESS_KEY_ID = CFG['aws_access_key_id'] -AWS_SECRET_ACCESS_KEY = CFG['aws_secret_access_key'] +#AWS_SES_REGION_NAME = CFG['aws_region'] +#AWS_SES_REGION_ENDPOINT = CFG['aws_smtp'] -EMAIL_HOST = CFG['aws_smtp'] -EMAIL_PORT = CFG['aws_port'] -EMAIL_HOST_USER = CFG['aws_smtp_username'] -EMAIL_HOST_PASSWORD = CFG['aws_smtp_password'] -EMAIL_USE_TLS = CFG['email_use_tls'] +#AWS_SES_ACCESS_KEY_ID = CFG['aws_access_key_id'] +#AWS_SES_SECRET_ACCESS_KEY = CFG['aws_secret_access_key'] +#AWS_ACCESS_KEY_ID = CFG['aws_access_key_id'] +#AWS_SECRET_ACCESS_KEY = CFG['aws_secret_access_key'] + +#EMAIL_HOST = CFG['aws_smtp'] +#EMAIL_PORT = CFG['aws_port'] +#EMAIL_HOST_USER = CFG['aws_smtp_username'] +#EMAIL_HOST_PASSWORD = CFG['aws_smtp_password'] +#EMAIL_USE_TLS = CFG['email_use_tls'] DEFAULT_FROM_EMAIL = 'info@rowsandall.com' +SERVER_EMAIL = 'support@rowsandall.com' # weather stuff diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py index 1adb217b..53cf1694 100644 --- a/rowsandall_app/settings_dev.py +++ b/rowsandall_app/settings_dev.py @@ -105,16 +105,16 @@ SITE_URL = "http://localhost:8000" # EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend' # EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -EMAIL_BACKEND = 'django_ses.SESBackend' +#EMAIL_BACKEND = 'django_ses.SESBackend' -AWS_SES_REGION_NAME = 'eu-west-1' -AWS_SES_REGION_ENDPOINT = 'email.eu-west-1.amazonaws.com' +#AWS_SES_REGION_NAME = 'eu-west-1' +#AWS_SES_REGION_ENDPOINT = 'email.eu-west-1.amazonaws.com' -EMAIL_HOST = CFG['aws_smtp'] -EMAIL_PORT = CFG['aws_port'] -EMAIL_HOST_USER = CFG['aws_smtp_username'] -EMAIL_HOST_PASSWORD = CFG['aws_smtp_password'] -EMAIL_USE_TLS = CFG['email_use_tls'] -DEFAULT_FROM_EMAIL = 'info@rowsandall.com' +#EMAIL_HOST = CFG['aws_smtp'] +#EMAIL_PORT = CFG['aws_port'] +#EMAIL_HOST_USER = CFG['aws_smtp_username'] +#EMAIL_HOST_PASSWORD = CFG['aws_smtp_password'] +#EMAIL_USE_TLS = CFG['email_use_tls'] +#DEFAULT_FROM_EMAIL = 'info@rowsandall.com' SETTINGS_NAME = 'rowsandall_app.settings_dev'