Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions terraform/morph/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ resource "cloudflare_record" "spf" {
zone_id = cloudflare_zone.main.id
name = "morph.io"
type = "TXT"
value = "v=spf1 include:_spf.google.com -all"
value = "v=spf1 include:_spf1.oaf.org.au include:_spf.google.com -all"
}

resource "cloudflare_record" "google_site_verification" {
Expand Down Expand Up @@ -120,7 +120,7 @@ resource "cloudflare_record" "dmarc" {
zone_id = cloudflare_zone.main.id
name = "_dmarc.morph.io"
type = "TXT"
value = "v=DMARC1; p=none; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+yuyhziqptlw@dmarc.postmarkapp.com; ruf=; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
value = "v=DMARC1; p=none; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+yuyhziqptlw@dmarc.postmarkapp.com; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
}

# CAA records
Expand Down
2 changes: 1 addition & 1 deletion terraform/oaf/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ resource "cloudflare_record" "dmarc" {
zone_id = var.oaf_org_au_zone_id
name = "_dmarc.oaf.org.au"
type = "TXT"
value = "v=DMARC1; p=none; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+ff2eamlrqpn@dmarc.postmarkapp.com; ruf=; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
value = "v=DMARC1; p=none; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+ff2eamlrqpn@dmarc.postmarkapp.com; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
}

# SPF include record containing all A records for OAF services
Expand Down
2 changes: 1 addition & 1 deletion terraform/openaustralia/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -242,5 +242,5 @@ resource "cloudflare_record" "alt_dmarc" {
zone_id = cloudflare_zone.org_au.id
name = "_dmarc.openaustralia.org.au"
type = "TXT"
value = "v=DMARC1; p=none; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+no6xy3wrymr@dmarc.postmarkapp.com; ruf=; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
value = "v=DMARC1; p=none; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+no6xy3wrymr@dmarc.postmarkapp.com; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
}
4 changes: 2 additions & 2 deletions terraform/planningalerts/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ resource "cloudflare_record" "spf" {
zone_id = cloudflare_zone.main.id
name = "planningalerts.org.au"
type = "TXT"
value = "v=spf1 include:_spf.google.com a:cuttlefish.oaf.org.au -all"
value = "v=spf1 include:_spf1.oaf.org.au include:_spf.google.com a:cuttlefish.oaf.org.au -all"
}

resource "cloudflare_record" "google_site_verification" {
Expand Down Expand Up @@ -129,5 +129,5 @@ resource "cloudflare_record" "dmarc" {
zone_id = cloudflare_zone.main.id
name = "_dmarc.planningalerts.org.au"
type = "TXT"
value = "v=DMARC1; p=none; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+b1g0fn6boqu@dmarc.postmarkapp.com; ruf=; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
value = "v=DMARC1; p=none; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+b1g0fn6boqu@dmarc.postmarkapp.com; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
}
2 changes: 1 addition & 1 deletion terraform/righttoknow/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ resource "cloudflare_record" "dmarc" {
zone_id = cloudflare_zone.main.id
name = "_dmarc.righttoknow.org.au"
type = "TXT"
value = "v=DMARC1; p=quarantine; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+aysyay6u9ct@dmarc.postmarkapp.com; ruf=; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
value = "v=DMARC1; p=quarantine; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+aysyay6u9ct@dmarc.postmarkapp.com; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
}

# Staging environment DNS records
Expand Down
8 changes: 4 additions & 4 deletions terraform/theyvoteforyou/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ resource "cloudflare_record" "spf" {
zone_id = cloudflare_zone.org_au.id
name = "theyvoteforyou.org.au"
type = "TXT"
value = "v=spf1 include:_spf.google.com -all"
value = "v=spf1 include:_spf1.oaf.org.au include:_spf.google.com -all"
}

# TODO: Remove this once the one below is up and running
Expand Down Expand Up @@ -141,7 +141,7 @@ resource "cloudflare_record" "tvfy_dmarc" {
zone_id = cloudflare_zone.org_au.id
name = "_dmarc.theyvoteforyou.org.au"
type = "TXT"
value = "v=DMARC1; p=none; pct=100; rua=mailto:re+ldnqce6nisu@dmarc.postmarkapp.com; sp=none; aspf=r;"
value = "v=DMARC1; p=none; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+ldnqce6nisu@dmarc.postmarkapp.com; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
}

## theyvoteforyou.org
Expand Down Expand Up @@ -172,7 +172,7 @@ resource "cloudflare_record" "tvfy_alt1_dmarc" {
zone_id = cloudflare_zone.org.id
name = "_dmarc.theyvoteforyou.org"
type = "TXT"
value = "v=DMARC1; p=none; pct=100; rua=mailto:re+qbce7gaoklg@dmarc.postmarkapp.com; sp=none; aspf=r;"
value = "v=DMARC1; p=none; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+qbce7gaoklg@dmarc.postmarkapp.com; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
}

## theyvoteforyou.com.au
Expand Down Expand Up @@ -203,5 +203,5 @@ resource "cloudflare_record" "tvfy_alt2_dmarc" {
zone_id = cloudflare_zone.com_au.id
name = "_dmarc.theyvoteforyou.com.au"
type = "TXT"
value = "v=DMARC1; p=none; pct=100; rua=mailto:re+ffljniarmuh@dmarc.postmarkapp.com; sp=none; aspf=r;"
value = "v=DMARC1; p=none; rua=mailto:dmarc.dpdztvxlz24gajbdj6yz@mail.suped.com,mailto:re+ffljniarmuh@dmarc.postmarkapp.com; pct=100; adkim=r; aspf=r; fo=1; ri=86400"
}
Loading