dap-ps/infra-dapps
1
0
Fork 0
mirror of https://github.com/dap-ps/infra-dapps.git synced 2025-02-23 09:28:09 +00:00
Code Issues Projects Releases Wiki Activity

fix s3 permissions, add missing s3 bucket save step

Browse Source 
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-05-31 17:40:11 -04:00
parent 22f54ded13
commit f5c5cde83e
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/index.js
View File

@ -30,7 +30,7 @@ console.log("AWS Lambda SES Forwarder // @arithmetric // Version 4.2.0");
// To match a mailbox name on all domains, use a key without the "at" symbol // To match a mailbox name on all domains, use a key without the "at" symbol
// and domain part of an email address (i.e. `info`). // and domain part of an email address (i.e. `info`).
var defaultConfig = { var defaultConfig = {
fromEmail: "noreply@dap.ps", fromEmail: "",
subjectPrefix: "", subjectPrefix: "",
emailBucket: "ses-forwarder-emails", emailBucket: "ses-forwarder-emails",
emailKeyPrefix: "dap.ps/", emailKeyPrefix: "dap.ps/",

14
mail.tf
View File

@ -5,6 +5,8 @@
/* SES S3 Bucket --------------------------------*/ /* SES S3 Bucket --------------------------------*/
data "aws_caller_identity" "current" {}
resource "aws_s3_bucket" "ses-forwarder-emails" { resource "aws_s3_bucket" "ses-forwarder-emails" {
bucket = "ses-forwarder-emails" bucket = "ses-forwarder-emails"
acl = "private" acl = "private"
@ -27,7 +29,7 @@ resource "aws_s3_bucket" "ses-forwarder-emails" {
"Resource": "arn:aws:s3:::${var.ses_forwarder_bucket_name}/*", "Resource": "arn:aws:s3:::${var.ses_forwarder_bucket_name}/*",
"Condition": { "Condition": {
"StringEquals": { "StringEquals": {
"aws:Referer": "${var.ses_forwarder_admin_account_arn}" "aws:Referer": "${data.aws_caller_identity.current.account_id}"
} }
} }
} }
@ -40,6 +42,8 @@ EOF
} }
} }
/* SES Configuration --------------------------------*/
resource "aws_iam_role" "ses_lambda_role" { resource "aws_iam_role" "ses_lambda_role" {
name = "LambdaSesForwarder" name = "LambdaSesForwarder"
@ -119,9 +123,15 @@ resource "aws_ses_receipt_rule" "ses_forwarder" {
enabled = true enabled = true
scan_enabled = true scan_enabled = true
s3_action {
bucket_name = "${var.ses_forwarder_bucket_name}"
object_key_prefix = "${var.public_domain}/"
position = 1
}
lambda_action { lambda_action {
function_arn = "${aws_lambda_function.ses_forwarder.arn}" function_arn = "${aws_lambda_function.ses_forwarder.arn}"
invocation_type = "Event" invocation_type = "Event"
position = 1 position = 2
} }
} }