Skip to content

Commit

Permalink
terraform cloudflare version naming update
Browse files Browse the repository at this point in the history
Updated terraform cloudflare module to a new version which required the
renaming of value to content. Additionally modified some internal vars
for use.
  • Loading branch information
Adam Delo committed Sep 10, 2024
1 parent b65467f commit 0a378bc
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
18 changes: 9 additions & 9 deletions lab/provision/terraform/modules/cloudflare/dns_records.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data "http" "ipv4" {
resource "cloudflare_record" "apex_ipv4" {
name = data.sops_file.cloudflare_secrets.data["public_domain"]
zone_id = lookup(data.cloudflare_zones.domain.zones[0], "id")
value = chomp(data.http.ipv4.response_body)
content = chomp(data.http.ipv4.response_body)
proxied = true
type = "A"
ttl = 1
Expand All @@ -26,7 +26,7 @@ resource "cloudflare_record" "dns_record" {
zone_id = data.sops_file.cloudflare_secrets.data["zone_id"]

# Optional values
value = each.value.value
content = each.value.content
proxied = each.value.proxied
ttl = each.value.ttl
comment = each.value.comment
Expand All @@ -35,7 +35,7 @@ resource "cloudflare_record" "dns_record" {
resource "cloudflare_record" "cname_email-mailgun" {
name = "email.mailgun"
zone_id = lookup(data.cloudflare_zones.domain.zones[0], "id")
value = "mailgun.org"
content = "mailgun.org"
proxied = false
type = "CNAME"
ttl = 1
Expand All @@ -45,7 +45,7 @@ resource "cloudflare_record" "cname_email-mailgun" {
resource "cloudflare_record" "cname_mailgun" {
name = "mailgun"
zone_id = lookup(data.cloudflare_zones.domain.zones[0], "id")
value = "${data.sops_file.cloudflare_secrets.data["cloudflare_domain"]}"
content = "${data.sops_file.cloudflare_secrets.data["cloudflare_domain"]}"
proxied = true
type = "CNAME"
ttl = 1
Expand All @@ -54,7 +54,7 @@ resource "cloudflare_record" "cname_mailgun" {
resource "cloudflare_record" "cname_www" {
name = "www"
zone_id = lookup(data.cloudflare_zones.domain.zones[0], "id")
value = "${data.sops_file.cloudflare_secrets.data["cloudflare_domain"]}"
content = "${data.sops_file.cloudflare_secrets.data["cloudflare_domain"]}"
proxied = true
type = "CNAME"
ttl = 1
Expand All @@ -63,7 +63,7 @@ resource "cloudflare_record" "cname_www" {
resource "cloudflare_record" "mx_mxa" {
name = "mailgun"
zone_id = lookup(data.cloudflare_zones.domain.zones[0], "id")
value = data.sops_file.cloudflare_secrets.data["dns_records.mx_mxa"]
content = data.sops_file.cloudflare_secrets.data["dns_records.mx_mxa"]
proxied = false
type = "MX"
ttl = 1
Expand All @@ -74,7 +74,7 @@ resource "cloudflare_record" "mx_mxa" {
resource "cloudflare_record" "mx_mxb" {
name = "mailgun"
zone_id = lookup(data.cloudflare_zones.domain.zones[0], "id")
value = data.sops_file.cloudflare_secrets.data["dns_records.mx_mxb"]
content = data.sops_file.cloudflare_secrets.data["dns_records.mx_mxb"]
proxied = false
type = "MX"
ttl = 1
Expand All @@ -85,7 +85,7 @@ resource "cloudflare_record" "mx_mxb" {
resource "cloudflare_record" "txt_domainkey" {
name = "krs._domainkey.mailgun"
zone_id = lookup(data.cloudflare_zones.domain.zones[0], "id")
value = data.sops_file.cloudflare_secrets.data["dns_records.txt_mg-key"]
content = data.sops_file.cloudflare_secrets.data["dns_records.txt_mg-key"]
proxied = false
type = "TXT"
ttl = 1
Expand All @@ -95,7 +95,7 @@ resource "cloudflare_record" "txt_domainkey" {
resource "cloudflare_record" "txt_mailgun" {
name = "mailgun"
zone_id = lookup(data.cloudflare_zones.domain.zones[0], "id")
value = data.sops_file.cloudflare_secrets.data["dns_records.txt_mg"]
content = data.sops_file.cloudflare_secrets.data["dns_records.txt_mg"]
proxied = false
type = "TXT"
ttl = 1
Expand Down
6 changes: 3 additions & 3 deletions lab/provision/terraform/modules/cloudflare/secret.sops.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ zone_id: ENC[AES256_GCM,data:cYYRVrL7H+eqjo0DnZaA35dqjjWSm3Nncede3Xztuhc=,iv:TJe
dns_records:
mx_mxa: ENC[AES256_GCM,data:wmgtn3XwQ7CSf3Z7S7C7,iv:YMvvMJtbTjqgC7AAwBmOf7c5Q2nf5IgqWyGlUqZDZXM=,tag:yqX/6t5DlB2zadpVMYzHPw==,type:str]
mx_mxb: ENC[AES256_GCM,data:R0vSCDsQFT7cR9qa/Mbe,iv:FYmCnrSE96tui+c/PoBibKpSIXKD7+v/LYivBYIkX1I=,tag:j64fikxTDNfVGAYerePdOQ==,type:str]
txt_mg-key: ENC[AES256_GCM,data:0CEi4HrJP+hHwO5r4/vhbRoQhoMfVP96VCc2xB75GbsZ+zuxLuVeOC9YCFYAQixj76Jz099b0DnuFbwhQb+lGX5ldlT/lcs7qqiW0MNi9SRwQ9iBelj/gSqbDkVzTNkwDlpvw+5q9EHE+3tRjwlNkQhMpmhHGLDk5mhPh4b+qpATSO524OemLjdjK5izbpQrF0eXDaxGZ4ohc7Lz53+z5PEAOo8aTrQTBk+nM9lR8Z2zPhMkyvylOboWQt4dNcShkwlkKTH9mpc9S3wraBVaARpBDg6yJFEE/Api5kBxCuEK0R1SNJnovvR6JVTalrUSu6H35PIA+k+jNm2TtXHAmwUrn4eKMikVWjF5S06oYGFn6nfeYb1Xg5IoCZnOIo17V5+6YjramSCbsbL8WCSYwBYpBKiqjzfyH+FExRVvuia+PkkbHaANL976Jn6VO11mTWJuKybTmk2obnMDGP5It4KpGl71mVfzMnVaOOvkczn+u2B/F0duxbpb3722Pf3oxHE5l+0hXjmZWLkop71HJE0=,iv:nGVMRib3iSkzoqwCsXJwH4E15AV1HHBV7yKAmTcMYsQ=,tag:bGduVwKcUjkfKUzs5rWTiw==,type:str]
txt_mg-key: ENC[AES256_GCM,data:TWXdis4yoS9DbzRxnDR/w4S3atw/ttxsGeU0B/7MsQ9hizlqwL/NYCBBWwYaTy8z6JGzwdscfbY9q3kTx8Z/2WGlq7i/d1uw/xcqETi3BBSMEQgKpGeLkKbSK+hirxYVEU6guet4XIWYvTAFbI3gUC9pUGHhNVDeP1rgUi0nO3UTsh81qJusu/bANdwPCd6kCu6oqiW2KFvu8AgDPRSORqWyYF6ED9rmpdzoCAgD9dZ0RNtBcJuXhka2Cblp78zrA43dMfK2dFvOoycbQNgyChxlycGzGOfK5FkVYe/8+BLllc2cYvy0iAZ6yGel6J5sr77TmDKddzmHgLl/ppswDmaR76VsHFKdnrfvYpa4M3GviEwrjeHcIUJC2xxVrbD0ZF1VUZz5CjwmyBjF44d5h4CeJ6O53/OjrDSfJfguj1KlPctFK+Y3gxAmPP/F459UPMIN3xq5bKwowMlir4WbHXnw0scpENEYViLayAPjCtPsuZiof47LZoWsr79JMStVjjGkcGtcjVp8r0K6u2b+OUw=,iv:AGLnTQY5Xo5cTqsk9OUUFNDO4qxq+T2Q7jGeV0tp/DQ=,tag:bahUYQ5jMojGZwlBG577BA==,type:str]
txt_mg: ENC[AES256_GCM,data:3qA8MYdJS0IUrScOVTFYRIQrZLeXx9RhGqZqaqEeTQ==,iv:0MUpy1OlZEvlHVsAz4d0SDCHjNVVWQ7zv6kMrTLsS1Y=,tag:Nd+yiSD5LxlwORkWekVbPA==,type:str]
sops:
kms: []
Expand All @@ -24,8 +24,8 @@ sops:
eUpsb1VoZnBVV2h0VnZtZUVvUmxGWjAK06j1G9rV8tirNW/7g48CIc1YT6PazCHo
kujEGQtskcTMJvjepdlNiHziNqXMB2JRntw43FeD7VIh3403SRfoeg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-12-06T21:17:29Z"
mac: ENC[AES256_GCM,data:GUe0iKGnM8Db5eXf3SkvO5ULkBLOfQVIzsPalVwVBxLQirT188L8+ybRcItdmPBdyWVuEPhtugFuFMPy9e7suiMss/iKF1HIOAMpNxiD5NnyfFpyh0eYj/7hLgXe6Lipik592HtY5Y/5HrPbQbHlen12G13RBOlHZs0ST7tdi60=,iv:9R3k5UZYp2Rpi/XzuW0TRcNDWgt/fIeZN+AR8KmZ45Y=,tag:+cmG+TJc2UpcXjJkYJJVtg==,type:str]
lastmodified: "2024-08-30T15:17:09Z"
mac: ENC[AES256_GCM,data:ClPRQ+qj1p+uzTbS9wszR4ySQmdnQi8h4r8e9kt4sr5XbZ8MZfND1db1Ll0SGP3zvQb1IRmhpSV/TkuMPfCiBkFIC1Ux6zOEODeCZT91m6FOHYIwOQlQKvv/JeEN20jtShgbZeo+fbr0yQFlWReP+I7NcdIuTlxxSkD2aPkGwKE=,iv:/OT6a5KdQAQcaPGQsAql8qwlwrDsDlXKHQpVY4cyD5c=,tag:505jmPwRSBnk+LoKBIxR5w==,type:str]
pgp: []
unencrypted_regex: ^(kind)$
version: 3.7.3
4 changes: 2 additions & 2 deletions lab/provision/terraform/modules/cloudflare/variables.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variable "dns_records" {
type = map(object({
name = string
value = string
content = string
proxied = bool
ttl = number
type = string
Expand All @@ -10,7 +10,7 @@ variable "dns_records" {
default = {
dns1 = {
name = "_domainconnect"
value = "connect.domains.google.com"
content = "connect.domains.google.com"
proxied = true
ttl = 1
type = "CNAME"
Expand Down
11 changes: 6 additions & 5 deletions lab/provision/terraform/modules/cloudflare/zone_settings.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ resource "cloudflare_zone_settings_override" "zone_settings" {
security_level = "medium"
# /speed/optimization
brotli = "on"
minify {
css = "on"
js = "on"
html = "on"
}
// Deprecated
# minify {
# css = "on"
# js = "on"
# html = "on"
# }
early_hints = "off"
rocket_loader = "on"
# /caching/configuration
Expand Down

0 comments on commit 0a378bc

Please sign in to comment.