Skip to content

Commit

Permalink
Merge pull request #23 from wilr/master
Browse files Browse the repository at this point in the history
SilverStripe 4
  • Loading branch information
Nathan authored Oct 1, 2019
2 parents d0a5a20 + 3b8a327 commit c03d775
Show file tree
Hide file tree
Showing 7 changed files with 311 additions and 365 deletions.
3 changes: 3 additions & 0 deletions .upgrade.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
mappings:
SESMailer: Symbiote\SilverStripeSESMailer\Mail\SESMailer
SESQueuedMail: Symbiote\SilverStripeSESMailer\Jobs\SESQueuedMail
28 changes: 15 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ to enable the mailer
---
Name: AWSConfig
---
Injector:
Mailer:
class: SESMailer
SilverStripe\Core\Injector\Injector:
SilverStripe\Control\Email\Mailer:
class: Symbiote\SilverStripeSESMailer\Mail\SESMailer
constructor:
config:
credentials:
credentials:
key: YourKey
secret: YourSecret
region: us-west-2
Expand All @@ -21,23 +21,25 @@ Injector:
```
If your SES account is configured with a single 'from' address having being
verified, you can set an 'always from' email address which will always be the
If your SES account is configured with a single 'from' address having being
verified, you can set an 'always from' email address which will always be the
'From:' header, with the 'reply-to:' header set based on the calling code's
'From' variable. Just add
```
Injector:
Mailer:
SilverStripe\Core\Injector\Injector:
SilverStripe\Control\Email\Mailer:
properties:
alwaysFrom: [email protected]
```
Emails will be sent through the QueuedJobs module if it is installed. You can set the following configuration to bypass this behaviour even if QueuedJobs is installed
Emails will be sent through the QueuedJobs module if it is installed. You can
set the following configuration to bypass this behaviour even if QueuedJobs is
installed:
```
Injector:
Mailer:
properties:
useQueuedJobs: false
SilverStripe\Core\Injector\Injector:
SilverStripe\Control\Email\Mailer:
calls:
- [ setUseQueuedJobs, [ false ] ]
```
80 changes: 0 additions & 80 deletions code/jobs/SESQueuedMail.php

This file was deleted.

246 changes: 0 additions & 246 deletions code/mail/SESMailer.php

This file was deleted.

Loading

0 comments on commit c03d775

Please sign in to comment.