diff --git a/terraform/cdn.koyashiro.net/.terraform.lock.hcl b/terraform/cdn.koyashiro.net/.terraform.lock.hcl index c984c2df..1c3bbcfb 100644 --- a/terraform/cdn.koyashiro.net/.terraform.lock.hcl +++ b/terraform/cdn.koyashiro.net/.terraform.lock.hcl @@ -2,37 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.52.0" - constraints = "4.52.0" + version = "5.3.0" + constraints = "5.3.0" hashes = [ - "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=", - "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=", - "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=", - "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=", - "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=", - "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=", - "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=", - "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=", - "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=", - "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=", - "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=", - "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=", - "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=", - "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=", - "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0", - "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8", - "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238", - "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f", - "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f", - "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8", - "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9", - "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6", - "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb", - "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b", - "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380", - "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7", - "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672", + "h1:0+Cd0m7VaJVvrGmrf1ZJwHs/YgdIcks1PVMYadrElXc=", + "h1:ASK1oT+wl2MDATPNL3PVr76A1QEEqwJPI6n8TGHHcF4=", + "h1:AgT/tF7e/kFzVpsBEdAp1yxR2lMCHARm094RG57TVLg=", + "h1:CDIOBCvQ+1uhDGRSG6OM3kB0ZorvRtBw1a4etN+3IPc=", + "h1:FAQS7p1dH8ux8oYpXv0/ywLPU01ngB8f6fjz+3eVcOc=", + "h1:JInoYqg0b/qM/wgo5fu6eb+jqw9t+tnW3O5WPnOMdsc=", + "h1:TEXKKaRkcSnbidtu+HemZWPznJCetYNTpAvZ5vUbIZ0=", + "h1:YCX5pUsJIfjUsO2M+P1FGKTJjVEd9gTi7pD3jTXklDs=", + "zh:2f7b526dc7bdea594214b7428bf02a80643a0b53258d4981c747dae6dcfe2b57", + "zh:b96462bf725e12d7e497f2166948aa7cce864a399b8625a791137eef63eb6b24", + "zh:bd77b9b3ab4470e410a1c055cff279db44c8b7764721d9cbb8f1c0297ababa67", + "zh:c475fa28557f752333bd025f61acebc9bad36277cdc7ede5f343d07292a0af77", + "zh:cce185d33078085babc3d31d6e6d49510f262a1c19700bfd629e41c36a89579a", + "zh:d09ac7832c45c47d16400a59359a2063d40fd3ea9d85c04481619d587941d01d", + "zh:eabf86f677a54b9a668ea6940d35f3b9a985450857e55ce5082fac34ec4850fa", + "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32", + "zh:ffcfe68b27a3a54ec8a2052afa18091459a8b67a0388df52957a80c640b0448c", ] } diff --git a/terraform/cdn.koyashiro.net/dns_records.tf b/terraform/cdn.koyashiro.net/dns_records.tf index 8dbc26f6..ce49031a 100644 --- a/terraform/cdn.koyashiro.net/dns_records.tf +++ b/terraform/cdn.koyashiro.net/dns_records.tf @@ -1,9 +1,10 @@ -resource "cloudflare_record" "cname_cdn" { +resource "cloudflare_dns_record" "cname_cdn" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "CNAME" name = "cdn" content = "public.r2.dev" # R2 bucket is not supported proxied = true + ttl = 1 # automatic lifecycle { ignore_changes = [content] diff --git a/terraform/cdn.koyashiro.net/main.tf b/terraform/cdn.koyashiro.net/main.tf index 99902b1d..b02561d8 100644 --- a/terraform/cdn.koyashiro.net/main.tf +++ b/terraform/cdn.koyashiro.net/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = "4.52.0" + version = "5.3.0" } } diff --git a/terraform/koyashi.ro/.terraform.lock.hcl b/terraform/koyashi.ro/.terraform.lock.hcl index c984c2df..1c3bbcfb 100644 --- a/terraform/koyashi.ro/.terraform.lock.hcl +++ b/terraform/koyashi.ro/.terraform.lock.hcl @@ -2,37 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.52.0" - constraints = "4.52.0" + version = "5.3.0" + constraints = "5.3.0" hashes = [ - "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=", - "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=", - "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=", - "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=", - "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=", - "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=", - "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=", - "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=", - "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=", - "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=", - "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=", - "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=", - "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=", - "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=", - "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0", - "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8", - "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238", - "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f", - "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f", - "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8", - "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9", - "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6", - "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb", - "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b", - "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380", - "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7", - "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672", + "h1:0+Cd0m7VaJVvrGmrf1ZJwHs/YgdIcks1PVMYadrElXc=", + "h1:ASK1oT+wl2MDATPNL3PVr76A1QEEqwJPI6n8TGHHcF4=", + "h1:AgT/tF7e/kFzVpsBEdAp1yxR2lMCHARm094RG57TVLg=", + "h1:CDIOBCvQ+1uhDGRSG6OM3kB0ZorvRtBw1a4etN+3IPc=", + "h1:FAQS7p1dH8ux8oYpXv0/ywLPU01ngB8f6fjz+3eVcOc=", + "h1:JInoYqg0b/qM/wgo5fu6eb+jqw9t+tnW3O5WPnOMdsc=", + "h1:TEXKKaRkcSnbidtu+HemZWPznJCetYNTpAvZ5vUbIZ0=", + "h1:YCX5pUsJIfjUsO2M+P1FGKTJjVEd9gTi7pD3jTXklDs=", + "zh:2f7b526dc7bdea594214b7428bf02a80643a0b53258d4981c747dae6dcfe2b57", + "zh:b96462bf725e12d7e497f2166948aa7cce864a399b8625a791137eef63eb6b24", + "zh:bd77b9b3ab4470e410a1c055cff279db44c8b7764721d9cbb8f1c0297ababa67", + "zh:c475fa28557f752333bd025f61acebc9bad36277cdc7ede5f343d07292a0af77", + "zh:cce185d33078085babc3d31d6e6d49510f262a1c19700bfd629e41c36a89579a", + "zh:d09ac7832c45c47d16400a59359a2063d40fd3ea9d85c04481619d587941d01d", + "zh:eabf86f677a54b9a668ea6940d35f3b9a985450857e55ce5082fac34ec4850fa", + "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32", + "zh:ffcfe68b27a3a54ec8a2052afa18091459a8b67a0388df52957a80c640b0448c", ] } diff --git a/terraform/koyashi.ro/dns_records.tf b/terraform/koyashi.ro/dns_records.tf index a598cbe1..17e85629 100644 --- a/terraform/koyashi.ro/dns_records.tf +++ b/terraform/koyashi.ro/dns_records.tf @@ -1,117 +1,119 @@ -resource "cloudflare_record" "cname_root" { +resource "cloudflare_dns_record" "cname_root" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "CNAME" name = "@" content = "koyashiro.pages.dev" proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "cname_blog" { +resource "cloudflare_dns_record" "cname_blog" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "CNAME" name = "blog" content = "blog-koyashiro.pages.dev" proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "mx_primary" { +resource "cloudflare_dns_record" "mx_primary" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "MX" name = "@" content = "aspmx.l.google.com" - ttl = 1 # auto + ttl = 1 # automatic priority = 1 } -resource "cloudflare_record" "mx_alt1" { +resource "cloudflare_dns_record" "mx_alt1" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "MX" name = "@" content = "alt1.aspmx.l.google.com" - ttl = 1 # auto + ttl = 1 # automatic priority = 5 } -resource "cloudflare_record" "mx_alt2" { +resource "cloudflare_dns_record" "mx_alt2" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "MX" name = "@" content = "alt2.aspmx.l.google.com" - ttl = 1 # auto + ttl = 1 # automatic priority = 5 } -resource "cloudflare_record" "mx_alt3" { +resource "cloudflare_dns_record" "mx_alt3" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "MX" name = "@" content = "alt3.aspmx.l.google.com" - ttl = 1 # auto + ttl = 1 # automatic priority = 10 } -resource "cloudflare_record" "mx_alt4" { +resource "cloudflare_dns_record" "mx_alt4" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "MX" name = "@" content = "alt4.aspmx.l.google.com" - ttl = 1 # auto + ttl = 1 # automatic priority = 10 } -resource "cloudflare_record" "txt_spf" { +resource "cloudflare_dns_record" "txt_spf" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "TXT" name = "@" content = "v=spf1 include:koyashi.ro ~all" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dkim" { +resource "cloudflare_dns_record" "txt_dkim" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "TXT" name = "*._domainkey" content = "v=DKIM1; p=" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_google_dkim" { +resource "cloudflare_dns_record" "txt_google_dkim" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "TXT" name = "google._domainkey" content = "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsN9es+6C1V6MGC8Scg/nHQOEd9rtNraw6hqX6gi24F3i8hAVtlDC2FrSukqUz8HH1WEdaGxPir2yvE8xD7OxIT4uOUinb7eXY5CaCRJL9lpjj82FBcVOkiXcuTEFHu04kkHSo3fuLCl8OHrTup8HUqPJ2VwUiCeOkqjoy7Hv9VZDQmwjPbRyVncjVb/sDtVeY2bVUix1acSo/g5mIrbcw2xWrxCU/VWcEfOvQypfE+z9UfBpbeAGWArBD+l3+vLAWFb3dsMc4CvRa3mGY8kehOMTHnaaf2gO5k7afAkSil/zK580WLHG0Hq6rEG9tsawydVbrkCqRRsV9yAWhyI02QIDAQAB" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dmarc" { +resource "cloudflare_dns_record" "txt_dmarc" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "TXT" name = "_dmarc" content = "v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s;" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_google_suite_verification" { +resource "cloudflare_dns_record" "txt_google_suite_verification" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "TXT" name = "@" content = "google-site-verification=IXe9IiyOUytKAH9R0_KVE2Vmpt1iOB8kqwtSf-F4304" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_keybase_site_verification" { +resource "cloudflare_dns_record" "txt_keybase_site_verification" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "TXT" name = "@" content = "keybase-site-verification=h6nNjeIuG_eU4fByG3qFMwbC8-sUeC5pvpD_m5iIUh4" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_discord" { +resource "cloudflare_dns_record" "txt_discord" { zone_id = var.cloudflare_zone_id_koyashi_ro type = "TXT" name = "_discord" content = "dh=f083205940112e59edc7561488d3867f414384a3" - ttl = 1 # auto + ttl = 1 # automatic } diff --git a/terraform/koyashi.ro/main.tf b/terraform/koyashi.ro/main.tf index 99902b1d..b02561d8 100644 --- a/terraform/koyashi.ro/main.tf +++ b/terraform/koyashi.ro/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = "4.52.0" + version = "5.3.0" } } diff --git a/terraform/koyashiro.com/.terraform.lock.hcl b/terraform/koyashiro.com/.terraform.lock.hcl index c984c2df..1c3bbcfb 100644 --- a/terraform/koyashiro.com/.terraform.lock.hcl +++ b/terraform/koyashiro.com/.terraform.lock.hcl @@ -2,37 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.52.0" - constraints = "4.52.0" + version = "5.3.0" + constraints = "5.3.0" hashes = [ - "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=", - "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=", - "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=", - "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=", - "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=", - "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=", - "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=", - "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=", - "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=", - "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=", - "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=", - "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=", - "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=", - "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=", - "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0", - "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8", - "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238", - "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f", - "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f", - "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8", - "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9", - "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6", - "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb", - "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b", - "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380", - "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7", - "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672", + "h1:0+Cd0m7VaJVvrGmrf1ZJwHs/YgdIcks1PVMYadrElXc=", + "h1:ASK1oT+wl2MDATPNL3PVr76A1QEEqwJPI6n8TGHHcF4=", + "h1:AgT/tF7e/kFzVpsBEdAp1yxR2lMCHARm094RG57TVLg=", + "h1:CDIOBCvQ+1uhDGRSG6OM3kB0ZorvRtBw1a4etN+3IPc=", + "h1:FAQS7p1dH8ux8oYpXv0/ywLPU01ngB8f6fjz+3eVcOc=", + "h1:JInoYqg0b/qM/wgo5fu6eb+jqw9t+tnW3O5WPnOMdsc=", + "h1:TEXKKaRkcSnbidtu+HemZWPznJCetYNTpAvZ5vUbIZ0=", + "h1:YCX5pUsJIfjUsO2M+P1FGKTJjVEd9gTi7pD3jTXklDs=", + "zh:2f7b526dc7bdea594214b7428bf02a80643a0b53258d4981c747dae6dcfe2b57", + "zh:b96462bf725e12d7e497f2166948aa7cce864a399b8625a791137eef63eb6b24", + "zh:bd77b9b3ab4470e410a1c055cff279db44c8b7764721d9cbb8f1c0297ababa67", + "zh:c475fa28557f752333bd025f61acebc9bad36277cdc7ede5f343d07292a0af77", + "zh:cce185d33078085babc3d31d6e6d49510f262a1c19700bfd629e41c36a89579a", + "zh:d09ac7832c45c47d16400a59359a2063d40fd3ea9d85c04481619d587941d01d", + "zh:eabf86f677a54b9a668ea6940d35f3b9a985450857e55ce5082fac34ec4850fa", + "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32", + "zh:ffcfe68b27a3a54ec8a2052afa18091459a8b67a0388df52957a80c640b0448c", ] } diff --git a/terraform/koyashiro.com/dns_records.tf b/terraform/koyashiro.com/dns_records.tf index e154376d..ab4a9d5b 100644 --- a/terraform/koyashiro.com/dns_records.tf +++ b/terraform/koyashiro.com/dns_records.tf @@ -1,39 +1,40 @@ -resource "cloudflare_record" "cname_root" { +resource "cloudflare_dns_record" "cname_root" { zone_id = var.cloudflare_zone_id_koyashiro_com type = "CNAME" name = "@" content = "koyashi.ro" proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "txt_spf" { +resource "cloudflare_dns_record" "txt_spf" { zone_id = var.cloudflare_zone_id_koyashiro_com type = "TXT" name = "@" content = "v=spf1 -all" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dkim" { +resource "cloudflare_dns_record" "txt_dkim" { zone_id = var.cloudflare_zone_id_koyashiro_com type = "TXT" name = "*._domainkey" content = "v=DKIM1; p=" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dmarc" { +resource "cloudflare_dns_record" "txt_dmarc" { zone_id = var.cloudflare_zone_id_koyashiro_com type = "TXT" name = "_dmarc" content = "v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s;" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_keybase_site_verification" { +resource "cloudflare_dns_record" "txt_keybase_site_verification" { zone_id = var.cloudflare_zone_id_koyashiro_com type = "TXT" name = "@" content = "keybase-site-verification=N6TgXTI6Qgifnnk1WklcW7yDT-te8lJcK62zhaafuqM" - ttl = 1 # auto + ttl = 1 # automatic } diff --git a/terraform/koyashiro.com/main.tf b/terraform/koyashiro.com/main.tf index 99902b1d..b02561d8 100644 --- a/terraform/koyashiro.com/main.tf +++ b/terraform/koyashiro.com/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = "4.52.0" + version = "5.3.0" } } diff --git a/terraform/koyashiro.dev/.terraform.lock.hcl b/terraform/koyashiro.dev/.terraform.lock.hcl index c984c2df..1c3bbcfb 100644 --- a/terraform/koyashiro.dev/.terraform.lock.hcl +++ b/terraform/koyashiro.dev/.terraform.lock.hcl @@ -2,37 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.52.0" - constraints = "4.52.0" + version = "5.3.0" + constraints = "5.3.0" hashes = [ - "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=", - "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=", - "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=", - "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=", - "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=", - "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=", - "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=", - "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=", - "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=", - "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=", - "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=", - "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=", - "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=", - "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=", - "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0", - "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8", - "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238", - "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f", - "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f", - "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8", - "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9", - "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6", - "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb", - "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b", - "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380", - "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7", - "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672", + "h1:0+Cd0m7VaJVvrGmrf1ZJwHs/YgdIcks1PVMYadrElXc=", + "h1:ASK1oT+wl2MDATPNL3PVr76A1QEEqwJPI6n8TGHHcF4=", + "h1:AgT/tF7e/kFzVpsBEdAp1yxR2lMCHARm094RG57TVLg=", + "h1:CDIOBCvQ+1uhDGRSG6OM3kB0ZorvRtBw1a4etN+3IPc=", + "h1:FAQS7p1dH8ux8oYpXv0/ywLPU01ngB8f6fjz+3eVcOc=", + "h1:JInoYqg0b/qM/wgo5fu6eb+jqw9t+tnW3O5WPnOMdsc=", + "h1:TEXKKaRkcSnbidtu+HemZWPznJCetYNTpAvZ5vUbIZ0=", + "h1:YCX5pUsJIfjUsO2M+P1FGKTJjVEd9gTi7pD3jTXklDs=", + "zh:2f7b526dc7bdea594214b7428bf02a80643a0b53258d4981c747dae6dcfe2b57", + "zh:b96462bf725e12d7e497f2166948aa7cce864a399b8625a791137eef63eb6b24", + "zh:bd77b9b3ab4470e410a1c055cff279db44c8b7764721d9cbb8f1c0297ababa67", + "zh:c475fa28557f752333bd025f61acebc9bad36277cdc7ede5f343d07292a0af77", + "zh:cce185d33078085babc3d31d6e6d49510f262a1c19700bfd629e41c36a89579a", + "zh:d09ac7832c45c47d16400a59359a2063d40fd3ea9d85c04481619d587941d01d", + "zh:eabf86f677a54b9a668ea6940d35f3b9a985450857e55ce5082fac34ec4850fa", + "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32", + "zh:ffcfe68b27a3a54ec8a2052afa18091459a8b67a0388df52957a80c640b0448c", ] } diff --git a/terraform/koyashiro.dev/dns_records.tf b/terraform/koyashiro.dev/dns_records.tf index da12ad5f..6f44cfff 100644 --- a/terraform/koyashiro.dev/dns_records.tf +++ b/terraform/koyashiro.dev/dns_records.tf @@ -1,39 +1,40 @@ -resource "cloudflare_record" "cname_root" { +resource "cloudflare_dns_record" "cname_root" { zone_id = var.cloudflare_zone_id_koyashiro_dev type = "CNAME" name = "@" content = "koyashi.ro" proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "txt_spf" { +resource "cloudflare_dns_record" "txt_spf" { zone_id = var.cloudflare_zone_id_koyashiro_dev type = "TXT" name = "@" content = "v=spf1 -all" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dkim" { +resource "cloudflare_dns_record" "txt_dkim" { zone_id = var.cloudflare_zone_id_koyashiro_dev type = "TXT" name = "*._domainkey" content = "v=DKIM1; p=" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dmarc" { +resource "cloudflare_dns_record" "txt_dmarc" { zone_id = var.cloudflare_zone_id_koyashiro_dev type = "TXT" name = "_dmarc" content = "v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s;" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_keybase_site_verification" { +resource "cloudflare_dns_record" "txt_keybase_site_verification" { zone_id = var.cloudflare_zone_id_koyashiro_dev type = "TXT" name = "@" content = "keybase-site-verification=cgtWui1rP9uCabMptNv5HvLRW6yWnQpHTvfTjhlSPFA" - ttl = 1 # auto + ttl = 1 # automatic } diff --git a/terraform/koyashiro.dev/main.tf b/terraform/koyashiro.dev/main.tf index 99902b1d..b02561d8 100644 --- a/terraform/koyashiro.dev/main.tf +++ b/terraform/koyashiro.dev/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = "4.52.0" + version = "5.3.0" } } diff --git a/terraform/koyashiro.jp/.terraform.lock.hcl b/terraform/koyashiro.jp/.terraform.lock.hcl index c984c2df..1c3bbcfb 100644 --- a/terraform/koyashiro.jp/.terraform.lock.hcl +++ b/terraform/koyashiro.jp/.terraform.lock.hcl @@ -2,37 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.52.0" - constraints = "4.52.0" + version = "5.3.0" + constraints = "5.3.0" hashes = [ - "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=", - "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=", - "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=", - "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=", - "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=", - "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=", - "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=", - "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=", - "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=", - "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=", - "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=", - "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=", - "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=", - "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=", - "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0", - "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8", - "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238", - "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f", - "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f", - "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8", - "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9", - "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6", - "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb", - "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b", - "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380", - "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7", - "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672", + "h1:0+Cd0m7VaJVvrGmrf1ZJwHs/YgdIcks1PVMYadrElXc=", + "h1:ASK1oT+wl2MDATPNL3PVr76A1QEEqwJPI6n8TGHHcF4=", + "h1:AgT/tF7e/kFzVpsBEdAp1yxR2lMCHARm094RG57TVLg=", + "h1:CDIOBCvQ+1uhDGRSG6OM3kB0ZorvRtBw1a4etN+3IPc=", + "h1:FAQS7p1dH8ux8oYpXv0/ywLPU01ngB8f6fjz+3eVcOc=", + "h1:JInoYqg0b/qM/wgo5fu6eb+jqw9t+tnW3O5WPnOMdsc=", + "h1:TEXKKaRkcSnbidtu+HemZWPznJCetYNTpAvZ5vUbIZ0=", + "h1:YCX5pUsJIfjUsO2M+P1FGKTJjVEd9gTi7pD3jTXklDs=", + "zh:2f7b526dc7bdea594214b7428bf02a80643a0b53258d4981c747dae6dcfe2b57", + "zh:b96462bf725e12d7e497f2166948aa7cce864a399b8625a791137eef63eb6b24", + "zh:bd77b9b3ab4470e410a1c055cff279db44c8b7764721d9cbb8f1c0297ababa67", + "zh:c475fa28557f752333bd025f61acebc9bad36277cdc7ede5f343d07292a0af77", + "zh:cce185d33078085babc3d31d6e6d49510f262a1c19700bfd629e41c36a89579a", + "zh:d09ac7832c45c47d16400a59359a2063d40fd3ea9d85c04481619d587941d01d", + "zh:eabf86f677a54b9a668ea6940d35f3b9a985450857e55ce5082fac34ec4850fa", + "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32", + "zh:ffcfe68b27a3a54ec8a2052afa18091459a8b67a0388df52957a80c640b0448c", ] } diff --git a/terraform/koyashiro.jp/dns_records.tf b/terraform/koyashiro.jp/dns_records.tf index 64ba7165..a6c27af9 100644 --- a/terraform/koyashiro.jp/dns_records.tf +++ b/terraform/koyashiro.jp/dns_records.tf @@ -1,39 +1,40 @@ -resource "cloudflare_record" "cname_root" { +resource "cloudflare_dns_record" "cname_root" { zone_id = var.cloudflare_zone_id_koyashiro_jp type = "CNAME" name = "@" content = "koyashi.ro" proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "txt_spf" { +resource "cloudflare_dns_record" "txt_spf" { zone_id = var.cloudflare_zone_id_koyashiro_jp type = "TXT" name = "@" content = "v=spf1 -all" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dkim" { +resource "cloudflare_dns_record" "txt_dkim" { zone_id = var.cloudflare_zone_id_koyashiro_jp type = "TXT" name = "*._domainkey" content = "v=DKIM1; p=" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dmarc" { +resource "cloudflare_dns_record" "txt_dmarc" { zone_id = var.cloudflare_zone_id_koyashiro_jp type = "TXT" name = "_dmarc" content = "v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s;" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_keybase_site_verification" { +resource "cloudflare_dns_record" "txt_keybase_site_verification" { zone_id = var.cloudflare_zone_id_koyashiro_jp type = "TXT" name = "@" content = "keybase-site-verification=0NfRd3yTw2Ssdw6_sWzjtACKv0NK78p4-c7FcBBQj9k" - ttl = 1 # auto + ttl = 1 # automatic } diff --git a/terraform/koyashiro.jp/main.tf b/terraform/koyashiro.jp/main.tf index 99902b1d..b02561d8 100644 --- a/terraform/koyashiro.jp/main.tf +++ b/terraform/koyashiro.jp/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = "4.52.0" + version = "5.3.0" } } diff --git a/terraform/koyashiro.live/.terraform.lock.hcl b/terraform/koyashiro.live/.terraform.lock.hcl index afe786e1..6c12407b 100644 --- a/terraform/koyashiro.live/.terraform.lock.hcl +++ b/terraform/koyashiro.live/.terraform.lock.hcl @@ -2,38 +2,26 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.52.0" - constraints = "4.52.0" + version = "5.3.0" + constraints = "5.3.0" hashes = [ - "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=", - "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=", - "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=", - "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=", - "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=", - "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=", - "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=", - "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=", - "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=", - "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=", - "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=", - "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=", - "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=", - "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=", - "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0", - "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8", - "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238", - "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f", - "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f", - "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8", - "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9", - "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6", - "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb", - "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b", - "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380", - "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7", - "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672", + "h1:0+Cd0m7VaJVvrGmrf1ZJwHs/YgdIcks1PVMYadrElXc=", + "h1:ASK1oT+wl2MDATPNL3PVr76A1QEEqwJPI6n8TGHHcF4=", + "h1:AgT/tF7e/kFzVpsBEdAp1yxR2lMCHARm094RG57TVLg=", + "h1:CDIOBCvQ+1uhDGRSG6OM3kB0ZorvRtBw1a4etN+3IPc=", + "h1:FAQS7p1dH8ux8oYpXv0/ywLPU01ngB8f6fjz+3eVcOc=", + "h1:JInoYqg0b/qM/wgo5fu6eb+jqw9t+tnW3O5WPnOMdsc=", + "h1:TEXKKaRkcSnbidtu+HemZWPznJCetYNTpAvZ5vUbIZ0=", + "h1:YCX5pUsJIfjUsO2M+P1FGKTJjVEd9gTi7pD3jTXklDs=", + "zh:2f7b526dc7bdea594214b7428bf02a80643a0b53258d4981c747dae6dcfe2b57", + "zh:b96462bf725e12d7e497f2166948aa7cce864a399b8625a791137eef63eb6b24", + "zh:bd77b9b3ab4470e410a1c055cff279db44c8b7764721d9cbb8f1c0297ababa67", + "zh:c475fa28557f752333bd025f61acebc9bad36277cdc7ede5f343d07292a0af77", + "zh:cce185d33078085babc3d31d6e6d49510f262a1c19700bfd629e41c36a89579a", + "zh:d09ac7832c45c47d16400a59359a2063d40fd3ea9d85c04481619d587941d01d", + "zh:eabf86f677a54b9a668ea6940d35f3b9a985450857e55ce5082fac34ec4850fa", + "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32", + "zh:ffcfe68b27a3a54ec8a2052afa18091459a8b67a0388df52957a80c640b0448c", ] } diff --git a/terraform/koyashiro.live/dns_records.tf b/terraform/koyashiro.live/dns_records.tf index 058c1c9e..b7e9abd2 100644 --- a/terraform/koyashiro.live/dns_records.tf +++ b/terraform/koyashiro.live/dns_records.tf @@ -1,47 +1,49 @@ -resource "cloudflare_record" "a_root" { +resource "cloudflare_dns_record" "a_root" { zone_id = var.cloudflare_zone_id_koyashiro_live type = "A" name = "@" content = resource.vultr_instance.instance.main_ip proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "aaaa_root" { +resource "cloudflare_dns_record" "aaaa_root" { zone_id = var.cloudflare_zone_id_koyashiro_live type = "AAAA" name = "@" content = resource.vultr_instance.instance.v6_main_ip proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "txt_spf" { +resource "cloudflare_dns_record" "txt_spf" { zone_id = var.cloudflare_zone_id_koyashiro_live type = "TXT" name = "@" content = "v=spf1 -all" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dkim" { +resource "cloudflare_dns_record" "txt_dkim" { zone_id = var.cloudflare_zone_id_koyashiro_live type = "TXT" name = "*._domainkey" content = "v=DKIM1; p=" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dmarc" { +resource "cloudflare_dns_record" "txt_dmarc" { zone_id = var.cloudflare_zone_id_koyashiro_live type = "TXT" name = "_dmarc" content = "v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s;" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_keybase_site_verification" { +resource "cloudflare_dns_record" "txt_keybase_site_verification" { zone_id = var.cloudflare_zone_id_koyashiro_live type = "TXT" name = "@" content = "keybase-site-verification=yhN360YHknl0Hox6RN5ZbeJ6vXvPhv8vvPdigvPWLmg" - ttl = 1 # auto + ttl = 1 # automatic } diff --git a/terraform/koyashiro.live/main.tf b/terraform/koyashiro.live/main.tf index e821dcf0..9741bc7f 100644 --- a/terraform/koyashiro.live/main.tf +++ b/terraform/koyashiro.live/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = "4.52.0" + version = "5.3.0" } vultr = { diff --git a/terraform/koyashiro.me/.terraform.lock.hcl b/terraform/koyashiro.me/.terraform.lock.hcl index c984c2df..1c3bbcfb 100644 --- a/terraform/koyashiro.me/.terraform.lock.hcl +++ b/terraform/koyashiro.me/.terraform.lock.hcl @@ -2,37 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.52.0" - constraints = "4.52.0" + version = "5.3.0" + constraints = "5.3.0" hashes = [ - "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=", - "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=", - "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=", - "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=", - "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=", - "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=", - "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=", - "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=", - "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=", - "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=", - "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=", - "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=", - "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=", - "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=", - "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0", - "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8", - "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238", - "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f", - "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f", - "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8", - "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9", - "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6", - "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb", - "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b", - "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380", - "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7", - "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672", + "h1:0+Cd0m7VaJVvrGmrf1ZJwHs/YgdIcks1PVMYadrElXc=", + "h1:ASK1oT+wl2MDATPNL3PVr76A1QEEqwJPI6n8TGHHcF4=", + "h1:AgT/tF7e/kFzVpsBEdAp1yxR2lMCHARm094RG57TVLg=", + "h1:CDIOBCvQ+1uhDGRSG6OM3kB0ZorvRtBw1a4etN+3IPc=", + "h1:FAQS7p1dH8ux8oYpXv0/ywLPU01ngB8f6fjz+3eVcOc=", + "h1:JInoYqg0b/qM/wgo5fu6eb+jqw9t+tnW3O5WPnOMdsc=", + "h1:TEXKKaRkcSnbidtu+HemZWPznJCetYNTpAvZ5vUbIZ0=", + "h1:YCX5pUsJIfjUsO2M+P1FGKTJjVEd9gTi7pD3jTXklDs=", + "zh:2f7b526dc7bdea594214b7428bf02a80643a0b53258d4981c747dae6dcfe2b57", + "zh:b96462bf725e12d7e497f2166948aa7cce864a399b8625a791137eef63eb6b24", + "zh:bd77b9b3ab4470e410a1c055cff279db44c8b7764721d9cbb8f1c0297ababa67", + "zh:c475fa28557f752333bd025f61acebc9bad36277cdc7ede5f343d07292a0af77", + "zh:cce185d33078085babc3d31d6e6d49510f262a1c19700bfd629e41c36a89579a", + "zh:d09ac7832c45c47d16400a59359a2063d40fd3ea9d85c04481619d587941d01d", + "zh:eabf86f677a54b9a668ea6940d35f3b9a985450857e55ce5082fac34ec4850fa", + "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32", + "zh:ffcfe68b27a3a54ec8a2052afa18091459a8b67a0388df52957a80c640b0448c", ] } diff --git a/terraform/koyashiro.me/dns_records.tf b/terraform/koyashiro.me/dns_records.tf index 99f31a8f..a10f594e 100644 --- a/terraform/koyashiro.me/dns_records.tf +++ b/terraform/koyashiro.me/dns_records.tf @@ -1,39 +1,40 @@ -resource "cloudflare_record" "cname_root" { +resource "cloudflare_dns_record" "cname_root" { zone_id = var.cloudflare_zone_id_koyashiro_me type = "CNAME" name = "@" content = "koyashi.ro" proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "txt_spf" { +resource "cloudflare_dns_record" "txt_spf" { zone_id = var.cloudflare_zone_id_koyashiro_me type = "TXT" name = "@" content = "v=spf1 -all" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dkim" { +resource "cloudflare_dns_record" "txt_dkim" { zone_id = var.cloudflare_zone_id_koyashiro_me type = "TXT" name = "*._domainkey" content = "v=DKIM1; p=" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dmarc" { +resource "cloudflare_dns_record" "txt_dmarc" { zone_id = var.cloudflare_zone_id_koyashiro_me type = "TXT" name = "_dmarc" content = "v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s;" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_keybase_site_verification" { +resource "cloudflare_dns_record" "txt_keybase_site_verification" { zone_id = var.cloudflare_zone_id_koyashiro_me type = "TXT" name = "@" content = "keybase-site-verification=mXW1Jxxi9Cxm_w4TvEv1g3eFJVpm95-i0VCWsxSmr8M" - ttl = 1 # auto + ttl = 1 # automatic } diff --git a/terraform/koyashiro.me/main.tf b/terraform/koyashiro.me/main.tf index 99902b1d..b02561d8 100644 --- a/terraform/koyashiro.me/main.tf +++ b/terraform/koyashiro.me/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = "4.52.0" + version = "5.3.0" } } diff --git a/terraform/koyashiro.net/.terraform.lock.hcl b/terraform/koyashiro.net/.terraform.lock.hcl index c984c2df..1c3bbcfb 100644 --- a/terraform/koyashiro.net/.terraform.lock.hcl +++ b/terraform/koyashiro.net/.terraform.lock.hcl @@ -2,37 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.52.0" - constraints = "4.52.0" + version = "5.3.0" + constraints = "5.3.0" hashes = [ - "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=", - "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=", - "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=", - "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=", - "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=", - "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=", - "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=", - "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=", - "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=", - "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=", - "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=", - "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=", - "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=", - "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=", - "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0", - "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8", - "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238", - "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f", - "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f", - "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8", - "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9", - "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6", - "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb", - "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b", - "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380", - "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7", - "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672", + "h1:0+Cd0m7VaJVvrGmrf1ZJwHs/YgdIcks1PVMYadrElXc=", + "h1:ASK1oT+wl2MDATPNL3PVr76A1QEEqwJPI6n8TGHHcF4=", + "h1:AgT/tF7e/kFzVpsBEdAp1yxR2lMCHARm094RG57TVLg=", + "h1:CDIOBCvQ+1uhDGRSG6OM3kB0ZorvRtBw1a4etN+3IPc=", + "h1:FAQS7p1dH8ux8oYpXv0/ywLPU01ngB8f6fjz+3eVcOc=", + "h1:JInoYqg0b/qM/wgo5fu6eb+jqw9t+tnW3O5WPnOMdsc=", + "h1:TEXKKaRkcSnbidtu+HemZWPznJCetYNTpAvZ5vUbIZ0=", + "h1:YCX5pUsJIfjUsO2M+P1FGKTJjVEd9gTi7pD3jTXklDs=", + "zh:2f7b526dc7bdea594214b7428bf02a80643a0b53258d4981c747dae6dcfe2b57", + "zh:b96462bf725e12d7e497f2166948aa7cce864a399b8625a791137eef63eb6b24", + "zh:bd77b9b3ab4470e410a1c055cff279db44c8b7764721d9cbb8f1c0297ababa67", + "zh:c475fa28557f752333bd025f61acebc9bad36277cdc7ede5f343d07292a0af77", + "zh:cce185d33078085babc3d31d6e6d49510f262a1c19700bfd629e41c36a89579a", + "zh:d09ac7832c45c47d16400a59359a2063d40fd3ea9d85c04481619d587941d01d", + "zh:eabf86f677a54b9a668ea6940d35f3b9a985450857e55ce5082fac34ec4850fa", + "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32", + "zh:ffcfe68b27a3a54ec8a2052afa18091459a8b67a0388df52957a80c640b0448c", ] } diff --git a/terraform/koyashiro.net/cloudflare_pages.tf b/terraform/koyashiro.net/cloudflare_pages.tf index 6acfac5e..516d774f 100644 --- a/terraform/koyashiro.net/cloudflare_pages.tf +++ b/terraform/koyashiro.net/cloudflare_pages.tf @@ -3,16 +3,8 @@ resource "cloudflare_pages_project" "koyashiro_net" { name = "koyashiro-net" production_branch = "main" - source { - type = "github" - config { - owner = "koyashiro" - repo_name = "koyashiro.net" - production_branch = "main" - } - } - - build_config { + build_config = { + build_caching = true build_command = "npm run build" destination_dir = "dist" root_dir = "" @@ -22,15 +14,21 @@ resource "cloudflare_pages_project" "koyashiro_net" { web_analytics_token = "" } - deployment_configs { - preview { - environment_variables = { - NODE_VERSION = "22.10.0" + deployment_configs = { + preview = { + env_vars = { + NODE_VERSION = { + type = "plain_text" + value = "22.10.0" + } } } - production { - environment_variables = { - NODE_VERSION = "22.10.0" + production = { + env_vars = { + NODE_VERSION = { + type = "plain_text" + value = "22.10.0" + } } } } @@ -46,5 +44,5 @@ resource "cloudflare_pages_project" "koyashiro_net" { resource "cloudflare_pages_domain" "koyashiro_net" { account_id = var.cloudflare_account_id project_name = resource.cloudflare_pages_project.koyashiro_net.name - domain = resource.cloudflare_record.cname_root.hostname + name = resource.cloudflare_dns_record.cname_root.hostname } diff --git a/terraform/koyashiro.net/dns_records.tf b/terraform/koyashiro.net/dns_records.tf index 2577b32a..10a6562e 100644 --- a/terraform/koyashiro.net/dns_records.tf +++ b/terraform/koyashiro.net/dns_records.tf @@ -1,116 +1,118 @@ -resource "cloudflare_record" "cname_root" { +resource "cloudflare_dns_record" "cname_root" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "CNAME" name = "@" content = resource.cloudflare_pages_project.koyashiro_net.subdomain proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "cname_vpm" { +resource "cloudflare_dns_record" "cname_vpm" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "CNAME" name = "vpm" content = "vpm-repos.pages.dev" proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "mx_primary" { +resource "cloudflare_dns_record" "mx_primary" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "MX" name = "@" content = "aspmx.l.google.com" - ttl = 1 # auto + ttl = 1 # automatic priority = 1 } -resource "cloudflare_record" "mx_alt1" { +resource "cloudflare_dns_record" "mx_alt1" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "MX" name = "@" content = "alt1.aspmx.l.google.com" - ttl = 1 # auto + ttl = 1 # automatic priority = 5 } -resource "cloudflare_record" "mx_alt2" { +resource "cloudflare_dns_record" "mx_alt2" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "MX" name = "@" content = "alt2.aspmx.l.google.com" - ttl = 1 # auto + ttl = 1 # automatic priority = 5 } -resource "cloudflare_record" "mx_alt3" { +resource "cloudflare_dns_record" "mx_alt3" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "MX" name = "@" content = "alt3.aspmx.l.google.com" - ttl = 1 # auto + ttl = 1 # automatic priority = 10 } -resource "cloudflare_record" "mx_alt4" { +resource "cloudflare_dns_record" "mx_alt4" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "MX" name = "@" content = "alt4.aspmx.l.google.com" - ttl = 1 # auto + ttl = 1 # automatic priority = 10 } -resource "cloudflare_record" "txt_spf" { +resource "cloudflare_dns_record" "txt_spf" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "TXT" name = "@" content = "v=spf1 include:koyashiro.net ~all" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dkim" { +resource "cloudflare_dns_record" "txt_dkim" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "TXT" name = "*._domainkey" content = "v=DKIM1; p=" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_google_dkim" { +resource "cloudflare_dns_record" "txt_google_dkim" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "TXT" name = "google._domainkey" content = "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyhioqL5nv/wDnkrmguw+J1qpm2fsLev+PKZMVVCLuGurD/6UJUscAFRN5xpjbP4DOsTmQtP/pTj8M0+9DkRItkuJUGCb9U9DMi3MN2Ll9BAaEfKFUDg9OEudIW/kWBhawkQpKA1DREu/bnZPr8VvwcyrO+DhPRUHYsylEPWrCY8EdDSv4U/m4a2kc79l1aJLo3iC542LStRNw70ls8hKHWC8+49vup2FFWFn9ktSgQs21A5hDY+VB/vEnpqCyN8R+VP0q5QgmAxvwWtfGQ11kIE82+p6OOI2RNPHYt5wHlPtmyZCZh28l3PRrdzXXOJiV9KvC9FuAvJmHUuu9OoF5wIDAQAB" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dmarc" { +resource "cloudflare_dns_record" "txt_dmarc" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "TXT" name = "_dmarc" content = "v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s;" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_google_suite_verification" { +resource "cloudflare_dns_record" "txt_google_suite_verification" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "TXT" name = "@" content = "google-site-verification=7-AYDWnsMkam_BpKeKWqjbeTqglhrp80t1N4RtKg6gQ" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_keybase_site_verification" { +resource "cloudflare_dns_record" "txt_keybase_site_verification" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "TXT" name = "@" content = "keybase-site-verification=fFkMCr9xX06WBiCVODi28op8DCxmwfcYIN-iFSqEiwk" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_discord" { +resource "cloudflare_dns_record" "txt_discord" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "TXT" name = "_discord" content = "dh=2f7777c55cca3b5519378571f05bd3979da45d38" - ttl = 1 # auto + ttl = 1 # automatic } diff --git a/terraform/koyashiro.net/main.tf b/terraform/koyashiro.net/main.tf index 99902b1d..b02561d8 100644 --- a/terraform/koyashiro.net/main.tf +++ b/terraform/koyashiro.net/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = "4.52.0" + version = "5.3.0" } } diff --git a/terraform/koyashiro.sh/.terraform.lock.hcl b/terraform/koyashiro.sh/.terraform.lock.hcl index c984c2df..1c3bbcfb 100644 --- a/terraform/koyashiro.sh/.terraform.lock.hcl +++ b/terraform/koyashiro.sh/.terraform.lock.hcl @@ -2,37 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.52.0" - constraints = "4.52.0" + version = "5.3.0" + constraints = "5.3.0" hashes = [ - "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=", - "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=", - "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=", - "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=", - "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=", - "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=", - "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=", - "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=", - "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=", - "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=", - "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=", - "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=", - "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=", - "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=", - "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0", - "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8", - "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238", - "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f", - "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f", - "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8", - "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9", - "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6", - "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb", - "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b", - "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380", - "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7", - "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672", + "h1:0+Cd0m7VaJVvrGmrf1ZJwHs/YgdIcks1PVMYadrElXc=", + "h1:ASK1oT+wl2MDATPNL3PVr76A1QEEqwJPI6n8TGHHcF4=", + "h1:AgT/tF7e/kFzVpsBEdAp1yxR2lMCHARm094RG57TVLg=", + "h1:CDIOBCvQ+1uhDGRSG6OM3kB0ZorvRtBw1a4etN+3IPc=", + "h1:FAQS7p1dH8ux8oYpXv0/ywLPU01ngB8f6fjz+3eVcOc=", + "h1:JInoYqg0b/qM/wgo5fu6eb+jqw9t+tnW3O5WPnOMdsc=", + "h1:TEXKKaRkcSnbidtu+HemZWPznJCetYNTpAvZ5vUbIZ0=", + "h1:YCX5pUsJIfjUsO2M+P1FGKTJjVEd9gTi7pD3jTXklDs=", + "zh:2f7b526dc7bdea594214b7428bf02a80643a0b53258d4981c747dae6dcfe2b57", + "zh:b96462bf725e12d7e497f2166948aa7cce864a399b8625a791137eef63eb6b24", + "zh:bd77b9b3ab4470e410a1c055cff279db44c8b7764721d9cbb8f1c0297ababa67", + "zh:c475fa28557f752333bd025f61acebc9bad36277cdc7ede5f343d07292a0af77", + "zh:cce185d33078085babc3d31d6e6d49510f262a1c19700bfd629e41c36a89579a", + "zh:d09ac7832c45c47d16400a59359a2063d40fd3ea9d85c04481619d587941d01d", + "zh:eabf86f677a54b9a668ea6940d35f3b9a985450857e55ce5082fac34ec4850fa", + "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32", + "zh:ffcfe68b27a3a54ec8a2052afa18091459a8b67a0388df52957a80c640b0448c", ] } diff --git a/terraform/koyashiro.sh/dns_records.tf b/terraform/koyashiro.sh/dns_records.tf index cdc20757..0b480d79 100644 --- a/terraform/koyashiro.sh/dns_records.tf +++ b/terraform/koyashiro.sh/dns_records.tf @@ -1,47 +1,49 @@ -resource "cloudflare_record" "cname_root" { +resource "cloudflare_dns_record" "cname_root" { zone_id = var.cloudflare_zone_id_koyashiro_sh type = "CNAME" name = "@" content = "koyashiro-sh.pages.dev" proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "cname_dotfiles" { +resource "cloudflare_dns_record" "cname_dotfiles" { zone_id = var.cloudflare_zone_id_koyashiro_sh type = "CNAME" name = "dotfiles" content = "koyashiro-sh.pages.dev" proxied = true + ttl = 1 # automatic } -resource "cloudflare_record" "txt_spf" { +resource "cloudflare_dns_record" "txt_spf" { zone_id = var.cloudflare_zone_id_koyashiro_sh type = "TXT" name = "@" content = "v=spf1 -all" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dkim" { +resource "cloudflare_dns_record" "txt_dkim" { zone_id = var.cloudflare_zone_id_koyashiro_sh type = "TXT" name = "*._domainkey" content = "v=DKIM1; p=" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_dmarc" { +resource "cloudflare_dns_record" "txt_dmarc" { zone_id = var.cloudflare_zone_id_koyashiro_sh type = "TXT" name = "_dmarc" content = "v=DMARC1; p=reject; sp=reject; adkim=s; aspf=s;" - ttl = 1 # auto + ttl = 1 # automatic } -resource "cloudflare_record" "txt_keybase_site_verification" { +resource "cloudflare_dns_record" "txt_keybase_site_verification" { zone_id = var.cloudflare_zone_id_koyashiro_sh type = "TXT" name = "@" content = "keybase-site-verification=NNZVaBOMg3ALJyId1SRe4LGb6lxxYQr8Nau-yf1ut4w" - ttl = 1 # auto + ttl = 1 # automatic } diff --git a/terraform/koyashiro.sh/main.tf b/terraform/koyashiro.sh/main.tf index 99902b1d..b02561d8 100644 --- a/terraform/koyashiro.sh/main.tf +++ b/terraform/koyashiro.sh/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = "4.52.0" + version = "5.3.0" } } diff --git a/terraform/vpm.koyashiro.net/.terraform.lock.hcl b/terraform/vpm.koyashiro.net/.terraform.lock.hcl index c984c2df..1c3bbcfb 100644 --- a/terraform/vpm.koyashiro.net/.terraform.lock.hcl +++ b/terraform/vpm.koyashiro.net/.terraform.lock.hcl @@ -2,37 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.52.0" - constraints = "4.52.0" + version = "5.3.0" + constraints = "5.3.0" hashes = [ - "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=", - "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=", - "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=", - "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=", - "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=", - "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=", - "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=", - "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=", - "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=", - "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=", - "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=", - "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=", - "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=", - "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=", - "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0", - "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8", - "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238", - "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f", - "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f", - "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8", - "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9", - "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6", - "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb", - "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b", - "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380", - "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7", - "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672", + "h1:0+Cd0m7VaJVvrGmrf1ZJwHs/YgdIcks1PVMYadrElXc=", + "h1:ASK1oT+wl2MDATPNL3PVr76A1QEEqwJPI6n8TGHHcF4=", + "h1:AgT/tF7e/kFzVpsBEdAp1yxR2lMCHARm094RG57TVLg=", + "h1:CDIOBCvQ+1uhDGRSG6OM3kB0ZorvRtBw1a4etN+3IPc=", + "h1:FAQS7p1dH8ux8oYpXv0/ywLPU01ngB8f6fjz+3eVcOc=", + "h1:JInoYqg0b/qM/wgo5fu6eb+jqw9t+tnW3O5WPnOMdsc=", + "h1:TEXKKaRkcSnbidtu+HemZWPznJCetYNTpAvZ5vUbIZ0=", + "h1:YCX5pUsJIfjUsO2M+P1FGKTJjVEd9gTi7pD3jTXklDs=", + "zh:2f7b526dc7bdea594214b7428bf02a80643a0b53258d4981c747dae6dcfe2b57", + "zh:b96462bf725e12d7e497f2166948aa7cce864a399b8625a791137eef63eb6b24", + "zh:bd77b9b3ab4470e410a1c055cff279db44c8b7764721d9cbb8f1c0297ababa67", + "zh:c475fa28557f752333bd025f61acebc9bad36277cdc7ede5f343d07292a0af77", + "zh:cce185d33078085babc3d31d6e6d49510f262a1c19700bfd629e41c36a89579a", + "zh:d09ac7832c45c47d16400a59359a2063d40fd3ea9d85c04481619d587941d01d", + "zh:eabf86f677a54b9a668ea6940d35f3b9a985450857e55ce5082fac34ec4850fa", + "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32", + "zh:ffcfe68b27a3a54ec8a2052afa18091459a8b67a0388df52957a80c640b0448c", ] } diff --git a/terraform/vpm.koyashiro.net/cloudflare_pages.tf b/terraform/vpm.koyashiro.net/cloudflare_pages.tf index d54fe6f1..19844b76 100644 --- a/terraform/vpm.koyashiro.net/cloudflare_pages.tf +++ b/terraform/vpm.koyashiro.net/cloudflare_pages.tf @@ -3,16 +3,8 @@ resource "cloudflare_pages_project" "vpm_koyashiro_net" { name = "vpm-repos" production_branch = "main" - source { - type = "github" - config { - owner = "koyashiro" - repo_name = "vpm-repos" - production_branch = "main" - } - } - - build_config { + build_config = { + build_caching = true build_command = "npm run build" destination_dir = "dist" root_dir = "" @@ -33,5 +25,5 @@ resource "cloudflare_pages_project" "vpm_koyashiro_net" { resource "cloudflare_pages_domain" "vpm_koyashiro_net" { account_id = var.cloudflare_account_id project_name = resource.cloudflare_pages_project.vpm_koyashiro_net.name - domain = resource.cloudflare_record.cname_vpm.hostname + name = resource.cloudflare_dns_record.cname_vpm.hostname } diff --git a/terraform/vpm.koyashiro.net/dns_records.tf b/terraform/vpm.koyashiro.net/dns_records.tf index 07c46fe2..6286d3f1 100644 --- a/terraform/vpm.koyashiro.net/dns_records.tf +++ b/terraform/vpm.koyashiro.net/dns_records.tf @@ -1,7 +1,8 @@ -resource "cloudflare_record" "cname_vpm" { +resource "cloudflare_dns_record" "cname_vpm" { zone_id = var.cloudflare_zone_id_koyashiro_net type = "CNAME" name = "vpm" content = "vpm-repos.pages.dev" proxied = true + ttl = 1 # automatic } diff --git a/terraform/vpm.koyashiro.net/main.tf b/terraform/vpm.koyashiro.net/main.tf index 99902b1d..b02561d8 100644 --- a/terraform/vpm.koyashiro.net/main.tf +++ b/terraform/vpm.koyashiro.net/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { cloudflare = { source = "cloudflare/cloudflare" - version = "4.52.0" + version = "5.3.0" } }