-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow instantiating more environments #49
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| # TODO create NS and SOA records | ||
|
|
||
| resource "aws_route53_zone" "apex" { | ||
| name = var.zone_name | ||
| } | ||
|
|
||
| resource "aws_route53_record" "delegation-ns" { | ||
| count = var.attach_to_zone != null ? 1 : 0 | ||
| zone_id = var.attach_to_zone.zone_id | ||
| name = aws_route53_zone.apex.name | ||
| type = "NS" | ||
| ttl = "300" | ||
| records = aws_route53_zone.apex.name_servers | ||
| } | ||
|
|
||
| resource "aws_ses_domain_identity" "main" { | ||
| domain = var.zone_name | ||
| } | ||
|
|
||
| # SPF | ||
| resource "aws_route53_record" "route_53_root_txt" { | ||
| zone_id = aws_route53_zone.apex.id | ||
| name = "" | ||
| type = "TXT" | ||
| ttl = "300" | ||
| records = concat([ | ||
| "v=spf1 include:_spf.google.com include:amazonses.com include:40081384.spf02.hubspotemail.net include:_spf.osuosl.org ~all", | ||
| ], var.additional_root_txts) | ||
| } | ||
|
|
||
| # DKIM | ||
| resource "aws_ses_domain_dkim" "email_dkim" { | ||
| domain = aws_ses_domain_identity.main.domain | ||
| } | ||
|
|
||
| resource "aws_route53_record" "email_dkim_records" { | ||
| count = 3 | ||
| zone_id = aws_route53_zone.apex.id | ||
| name = "${element(aws_ses_domain_dkim.email_dkim.dkim_tokens, count.index)}._domainkey.${var.zone_name}" | ||
| type = "CNAME" | ||
| ttl = "300" | ||
| records = [ | ||
| "${element(aws_ses_domain_dkim.email_dkim.dkim_tokens, count.index)}.dkim.amazonses.com", | ||
| ] | ||
| } | ||
|
|
||
| resource "aws_route53_record" "route_53_dmarc_txt" { | ||
| zone_id = aws_route53_zone.apex.id | ||
| name = "_dmarc.${var.zone_name}" | ||
| type = "TXT" | ||
| ttl = "300" | ||
| records = [ | ||
| "v=DMARC1;p=quarantine;rua=mailto:dmarc-rpt@${var.zone_name}" | ||
| ] | ||
| } | ||
|
|
||
| resource "aws_route53_record" "dokku_wildcard" { | ||
| zone_id = aws_route53_zone.apex.id | ||
| name = "*.${var.zone_name}" | ||
| type = "CNAME" | ||
| ttl = "300" | ||
| records = [ | ||
| "dokku.${var.zone_name}" | ||
| ] | ||
| } | ||
|
|
||
| resource "aws_route53_record" "mailu-test-a" { | ||
| zone_id = aws_route53_zone.apex.id | ||
| name = "mail.mail-test.${var.zone_name}" | ||
| type = "A" | ||
| # TODO increase all these Mailu TTLs | ||
| ttl = "300" | ||
| records = [ | ||
| "140.211.167.146" | ||
| ] | ||
| } | ||
|
|
||
| resource "aws_route53_record" "mailu-test-mx" { | ||
| zone_id = aws_route53_zone.apex.id | ||
| name = "mail-test.${var.zone_name}" | ||
| type = "MX" | ||
| ttl = "300" | ||
| records = [ | ||
| "10 mail.mail-test.${var.zone_name}." | ||
| ] | ||
| } | ||
|
|
||
| resource "aws_route53_record" "mailu-test-spf" { | ||
| zone_id = aws_route53_zone.apex.id | ||
| name = "mail-test.${var.zone_name}" | ||
| type = "TXT" | ||
| ttl = "300" | ||
| records = [ | ||
| # This diverges from Mailu's rec: they wanted to include a:mail.mail-test.seagl.org too | ||
| "v=spf1 mx ~all" | ||
| ] | ||
| } | ||
|
|
||
| resource "aws_route53_record" "mailu-test-autoconfig-srv" { | ||
| # grep SRV | sed -e 's/ 600 IN SRV /": "/' -e 's/^/"/' -e 's/$/",/' -e 's/ mail.mail-test.seagl.org.//' -e 's/.mail-test.seagl.org.//' | ||
| for_each = { | ||
| "_imap._tcp" : "20 1 143", | ||
| "_pop3._tcp" : "20 1 110", | ||
| "_submission._tcp" : "20 1 587", | ||
| "_autodiscover._tcp" : "10 1 443", | ||
| "_submissions._tcp" : "10 1 465", | ||
| "_imaps._tcp" : "10 1 993", | ||
| "_pop3s._tcp" : "10 1 995" | ||
| } | ||
| zone_id = aws_route53_zone.apex.id | ||
| name = "${each.key}.mail-test.${var.zone_name}" | ||
| type = "SRV" | ||
| ttl = "300" | ||
| records = [ | ||
| "${each.value} mail.mail-test.${var.zone_name}." | ||
| ] | ||
| } | ||
|
|
||
| resource "aws_route53_record" "mailu-test-autoconfig-cname" { | ||
| zone_id = aws_route53_zone.apex.id | ||
| name = "autoconfig.mail-test.${var.zone_name}" | ||
| type = "CNAME" | ||
| ttl = "300" | ||
| records = [ | ||
| "mail.mail-test.${var.zone_name}." | ||
| ] | ||
| } | ||
|
|
||
| resource "aws_route53_record" "mailu-test-dkim" { | ||
| zone_id = aws_route53_zone.apex.id | ||
| name = "dkim._domainkey.mail-test.${var.zone_name}" | ||
| type = "TXT" | ||
| ttl = "300" | ||
| records = [ | ||
| # TODO parameterize this | ||
| "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Jw/diiAFRmarcHsr/KkGvfr22CVA5xTJTWRInvKi2My7PbWjhLSGNx7XcJw1DCcfOGb1cdArjNmYDmmG6VRRTQjCr2RWBSihIRLodnc+KPeS2Xnipi0JdNg7CTCNVQfA+znlKoWqalTT0nKrlDf87vhLmltU4wOYnrmvtZvtHkdwd9GA7hxMdHu4LnW\"\"X2VK0itMcPCBqIUvyOSIHJ8c7i8VPmcV+G6VDquepNsmFN0zcvNXAosqaWOHCnzCGzvQiwm6Lbq4vMxUsU6BLUv1JiPq3zXtqQ4tp6VynpLIy5VaF4XI5fyibsKTPuzI0d58tuiCrgCCMy5T9BmkCnQAzQIDAQAB" | ||
| ] | ||
| } | ||
|
|
||
| resource "aws_route53_record" "mailu-test-dmarc" { | ||
| zone_id = aws_route53_zone.apex.id | ||
| name = "_dmarc.mail-test.${var.zone_name}" | ||
| type = "TXT" | ||
| ttl = "300" | ||
| records = [ | ||
| # TODO this email doesn't seem to be created automatically | ||
| "v=DMARC1; p=reject; rua=mailto:dmarc@mail-test.${var.zone_name}; ruf=mailto:dmarc@mail-test.${var.zone_name}; adkim=s; aspf=s" | ||
| ] | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| module "mailu-vm" { | ||
| source = "./simple_vm" | ||
| source = "../simple_vm" | ||
| name = "mailu" | ||
| ports = [22, 25, 80, 110, 143, 443, 465, 587, 993, 995] | ||
| instance_type = "m1.medium" | ||
| network = "general_servers2" | ||
| disk_size = 30 | ||
| dns_zone = aws_route53_zone.apex | ||
| dns_zone = aws_route53_zone.apex | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| output "zone_id" { | ||
| value = aws_route53_zone.apex.id | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| variable "zone_name" { | ||
| description = "FQDN that will be suffixed to all hosts in the environment" | ||
| type = string | ||
| } | ||
|
|
||
| variable "attach_to_zone" { | ||
| description = "Route 53 zone object to attach (via NS record) the environment's zone to" | ||
| default = null | ||
| type = object({ | ||
| zone_id = string | ||
| }) | ||
| } | ||
|
|
||
| variable "additional_root_txts" { | ||
| description = "Additional TXT records to publish at the root of the zone" | ||
| type = list(string) | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be parameterized?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't bother because we're just going to delete Mailu test records anyway in favor of our prod deployment, managed by the
simple_vmmodule.