Page MenuHomePhabricator
Files F15399893

D21738.diff
No OneTemporary
Actions

D21738.diff
View Options

diff --git a/src/applications/metamta/adapter/PhabricatorMailPostmarkAdapter.php b/src/applications/metamta/adapter/PhabricatorMailPostmarkAdapter.php
--- a/src/applications/metamta/adapter/PhabricatorMailPostmarkAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailPostmarkAdapter.php
@@ -33,10 +33,11 @@
//
// "Configuring Outbound Email" should be updated if this changes.
//
- // These addresses were last updated in January 2019.
+ // These addresses were last updated in December 2021.
'50.31.156.6/32',
'50.31.156.77/32',
'18.217.206.57/32',
+ '3.134.147.250/32',
),
);
}
diff --git a/src/docs/user/configuration/configuring_inbound_email.diviner b/src/docs/user/configuration/configuring_inbound_email.diviner
--- a/src/docs/user/configuration/configuring_inbound_email.diviner
+++ b/src/docs/user/configuration/configuring_inbound_email.diviner
@@ -42,9 +42,9 @@
| Receive Mail With | Setup | Cost | Notes |
|--------|-------|------|-------|
-| Mailgun | Easy | Cheap | Recommended |
| Postmark | Easy | Cheap | Recommended |
| SendGrid | Easy | Cheap | |
+| Mailgun | Easy | Cheap | Discouraged |
| Local MTA | Difficult | Free | Discouraged |
The remainder of this document walks through configuring Phabricator to
@@ -183,6 +183,9 @@
example domain with your actual domain.
- Configure a mailer in `cluster.mailers` with your Mailgun API key.
+Use of Mailgun is discouraged because of concerns that they may not be a
+trustworthy custodian of sensitive data. See <https://phurl.io/u/mailgun> for
+discussion and context.
Postmark Setup
==============
diff --git a/src/docs/user/configuration/configuring_outbound_email.diviner b/src/docs/user/configuration/configuring_outbound_email.diviner
--- a/src/docs/user/configuration/configuring_outbound_email.diviner
+++ b/src/docs/user/configuration/configuring_outbound_email.diviner
@@ -17,7 +17,6 @@
| Send Mail With | Setup | Cost | Inbound | Media | Notes |
|----------------|-------|------|---------|-------|-------|
| Postmark | Easy | Cheap | Yes | Email | Recommended |
-| Mailgun | Easy | Cheap | Yes | Email | Recommended |
| Amazon SES | Easy | Cheap | No | Email | |
| SendGrid | Medium | Cheap | Yes | Email | |
| Twilio | Easy | Cheap | No | SMS | Recommended |
@@ -26,14 +25,15 @@
| Local SMTP | Hard | Free | No | Email | sendmail, postfix, etc |
| Custom | Hard | Free | No | All | Write a custom mailer. |
| Drop in a Hole | Easy | Free | No | All | Drops mail in a deep, dark hole. |
+| Mailgun | Easy | Cheap | Yes | Email | Discouraged |
See below for details on how to select and configure mail delivery for each
mailer.
-For email, Postmark or Mailgun are recommended because they make it easy to
-set up inbound and outbound mail and have good track records in our production
-services. Other services will also generally work well, but they may be more
-difficult to set up.
+For email, Postmark is recommended because it makes it easy to set up inbound
+and outbound mail and has a good track record in our production services. Other
+services will also generally work well, but they may be more difficult to set
+up.
For SMS, Twilio or SNS are recommended. They're also your only upstream
options.
@@ -87,8 +87,8 @@
```lang=json
[
{
- "key": "mycompany-mailgun",
- "type": "mailgun",
+ "key": "mycompany-postmark",
+ "type": "postmark",
"options": {
"domain": "mycompany.com",
"api-key": "..."
@@ -118,12 +118,12 @@
The `type` field can be used to select these mailer services:
- - `mailgun`: Use Mailgun.
- `ses`: Use Amazon SES.
- `sendgrid`: Use SendGrid.
- `postmark`: Use Postmark.
- `twilio`: Use Twilio.
- `sns`: Use Amazon SNS.
+ - `mailgun`: Use Mailgun.
It also supports these local mailers:
@@ -204,11 +204,12 @@
[
"50.31.156.6/32",
"50.31.156.77/32",
- "18.217.206.57/32"
+ "18.217.206.57/32",
+ "3.134.147.250/32"
]
```
-The default address ranges were last updated in January 2019, and were
+The default address ranges were last updated in December 2021, and were
documented at: <https://postmarkapp.com/support/article/800-ips-for-firewalls>
@@ -220,6 +221,10 @@
| Inbound | Yes
|---------|
+Use of Mailgun is discouraged because of concerns that they may not be a
+trustworthy custodian of sensitive data. See <https://phurl.io/u/mailgun> for
+discussion and context.
+
Mailgun is a third-party email delivery service. You can learn more at
<https://www.mailgun.com>. Mailgun is easy to configure and works well.
@@ -339,7 +344,7 @@
rules, blackholes, and MTA configuration which are beyond the scope of this
document. If you can already send outbound email from the command line or know
how to configure it, this option is straightforward. If you have no idea how to
-do any of this, strongly consider using Postmark or Mailgun instead.
+do any of this, strongly consider using Postmark instead.
To use this mailer, set `type` to `sendmail`, then configure these `options`:
@@ -416,7 +421,7 @@
next group.
For example, if you have two SMTP servers and you want to balance requests
-between them and then fall back to Mailgun if both fail, configure priorities
+between them and then fall back to Postmark if both fail, configure priorities
like this:
```lang=json
@@ -434,8 +439,8 @@
"options": "..."
},
{
- "key": "mailgun-fallback",
- "type": "mailgun",
+ "key": "postmark-fallback",
+ "type": "postmark",
"options": "..."
}
}
@@ -450,7 +455,7 @@
If it still hasn't sent the mail, Phabricator will try servers which are not
in any priority group, in the configured order. In this example there is
-only one such server, so it will try to send via Mailgun.
+only one such server, so it will try to send via Postmark.
Message-ID Headers

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 18, 8:19 AM (3 d, 19 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7475737
Default Alt Text
D21738.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility