Merge pull request #663 from rust-lang/rustconf-website

Change DNS records for `rustconf.com`
rust-lang · Jan 31, 2025 · e6c0a98 · e6c0a98
2 parents 3a56b48 + 33273f5
commit e6c0a98
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/terraform/dns/rustconf.com.tf b/terraform/dns/rustconf.com.tf
@@ -11,7 +11,8 @@ module "rustconf_com" {
   ttl     = 300
 
   A = {
-    "@" = ["185.124.108.132"],
+    "@"   = ["141.193.213.10", "141.193.213.11"],
+    "www" = ["141.193.213.10", "141.193.213.11"],
   }
 
   CNAME = {
@@ -22,14 +23,16 @@ module "rustconf_com" {
     "2020" = ["tildeio.github.io"],
     "2021" = ["rustconf-2021.netlify.app"],
     "2022" = ["rustconf-2022.netlify.app"],
+    "2024" = ["wp.wpenginepowered.com"],
   }
 
   MX = {
     "@" = local.mailgun_mx,
   }
 
   TXT = {
-    "@"             = [local.mailgun_spf],
-    "k1._domainkey" = ["k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6AVUUbCl/Ofx/ceeWryb4v//f/Sr5UGrRt4ibA4UY2JQ3Db++KEBsdur5qAxC9eiWeAbYQyfQhFGagbmLjyxd1eNepzAIPesz81U0hodsLCaKs7OHkLrQJcTRxVYwucL5rBXVLdAhg7A1veVeN1xiqh8HmEull5vYsmOknf6mtwIDAQAB"],
+    "@"                   = [local.mailgun_spf],
+    "_cf-custom-hostname" = ["060cc15f-2d51-4f19-b095-dfbb3eab7ca4"],
+    "k1._domainkey"       = ["k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6AVUUbCl/Ofx/ceeWryb4v//f/Sr5UGrRt4ibA4UY2JQ3Db++KEBsdur5qAxC9eiWeAbYQyfQhFGagbmLjyxd1eNepzAIPesz81U0hodsLCaKs7OHkLrQJcTRxVYwucL5rBXVLdAhg7A1veVeN1xiqh8HmEull5vYsmOknf6mtwIDAQAB"],
   }
 }
diff --git a/terraform/domain-redirects/redirects.tf b/terraform/domain-redirects/redirects.tf
@@ -32,20 +32,6 @@ module "docs_rs" {
   permanent = true
 }
 
-module "rustconf_com" {
-  source = "./impl"
-  providers = {
-    aws       = aws
-    aws.east1 = aws.east1
-  }
-
-  to_host = "rustconf.com"
-  from = [
-    "www.rustconf.com"
-  ]
-  permanent = true
-}
-
 module "cfp_rustconf_com" {
   source = "./impl"
   providers = {