Page MenuHomePhabricator
Files F14005631

D10505.diff
No OneTemporary
Actions

D10505.diff
View Options

diff --git a/conf/default.conf.php b/conf/default.conf.php
--- a/conf/default.conf.php
+++ b/conf/default.conf.php
@@ -334,6 +334,7 @@
// - Make sure 'metamta.default-address' is a validated SES "From" address.
'amazon-ses.access-key' => null,
'amazon-ses.secret-key' => null,
+ 'amazon-ses.host' => 'email.us-east-1.amazonaws.com',
// If you're using Sendgrid to send email, provide your access credentials
// here. This will use the REST API. You can also use Sendgrid as a normal
diff --git a/src/applications/config/option/PhabricatorAWSConfigOptions.php b/src/applications/config/option/PhabricatorAWSConfigOptions.php
--- a/src/applications/config/option/PhabricatorAWSConfigOptions.php
+++ b/src/applications/config/option/PhabricatorAWSConfigOptions.php
@@ -19,6 +19,14 @@
$this->newOption('amazon-ses.secret-key', 'string', null)
->setMasked(true)
->setDescription(pht('Secret key for Amazon SES.')),
+ $this->newOption(
+ 'amazon-ses.host',
+ 'string',
+ 'email.us-east-1.amazonaws.com')
+ ->setDescription(pht(
+ 'Api host for Amazon SES. '.
+ 'Refer to: '.
+ 'http://docs.aws.amazon.com/ses/latest/DeveloperGuide/regions.html')),
$this->newOption('amazon-s3.access-key', 'string', null)
->setLocked(true)
->setDescription(pht('Access key for Amazon S3.')),
diff --git a/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
--- a/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
+++ b/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
@@ -23,12 +23,13 @@
public function executeSend($body) {
$key = PhabricatorEnv::getEnvConfig('amazon-ses.access-key');
$secret = PhabricatorEnv::getEnvConfig('amazon-ses.secret-key');
+ $host = PhabricatorEnv::getEnvConfig('amazon-ses.host');
$root = phutil_get_library_root('phabricator');
$root = dirname($root);
require_once $root.'/externals/amazon-ses/ses.php';
- $service = new SimpleEmailService($key, $secret);
+ $service = new SimpleEmailService($key, $secret, $host);
$service->enableUseExceptions(true);
return $service->sendRawEmail($body);
}
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
@@ -135,6 +135,8 @@
"PhabricatorMailImplementationAmazonSESAdapter".
- **amazon-ses.access-key**: set to your Amazon SES access key.
- **amazon-ses.secret-key**: set to your Amazon SES secret key.
+ - **amazon-ses.host**: set to your Amazon SES API host per
+ <http://docs.aws.amazon.com/ses/latest/DeveloperGuide/regions.html>.
NOTE: Amazon SES **requires you to verify your "From" address**. Configure which
"From" address to use by setting "##metamta.default-address##" in your config,

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 28, 5:17 PM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6726281
Default Alt Text
D10505.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility