remove mollycollins.me

terraform/acm.tf

@@ -9,12 +9,3 @@ resource "aws_acm_certificate" "public" {
   }
   provider = aws.useast1
 }
-
-resource "aws_acm_certificate" "molly" {
-  domain_name       = "mollycollins.me"
-  validation_method = "DNS"
-  lifecycle {
-    create_before_destroy = true
-  }
-  provider = aws.useast1
-}

terraform/data.tf

@@ -7,11 +7,6 @@ locals {
   acm_chain          = "AQICAHgsJXuUfVcivglHv1qjCTscwl6NzhvBut8NdXoUXyTZ4gF7vjYWP4CGviDP9VZLXhrMAAAPDTCCDwkGCSqGSIb3DQEHBqCCDvowgg72AgEAMIIO7wYJKoZIhvcNAQcBMB4GCWCGSAFlAwQBLjARBAx8UGFU9wiemVm2bUYCARCAgg7Ab3iB0aS4lb83KyJSWDm9aX7lBqDNqeHIJaPhC5Zi1NSCNxXLZEy6lgAUP0AKpytUTcZ9Xt65ciPTOL9JP4A+ZD4ZecDKED7T+d5gCp8HoSO6phfs5unfzArluHra4jxS9JXCJrMHDzhhQ+kco5xi+GH5q9KrPjjgNDQST4EQyY14aiFgqo6tQ3cMArdjT7YXZ8qZi05nnEM1+dFWpBWx/Ku5Rs4Z1VWrUc2LzWQKEp84cSOjRJVC8Mq9G7C+4evvHk67lZJ2H8Q8OCvvQZ/HpLWG9Td1iKsx7tPEqBlJ7RecwmAlSy1LS2zWQ2wspS9bOBeIi4A5FzEhdM4vf9Luuiu/KKDo8GndzJKai8zP/9FqHcrzByZMriQ37zASUq7pI5O+G4QGQShoSOoFPQq8LhBYY/ffmRYu1YIkBYBbkFEfdexrLChrAsPyQq7r5jsiRHM2Bbjtgf6kgKWk8Lts5LaO7+HW4D2G/JQx8473tHx3EJYc87/IFlTNdKCW//FFKx2tG7VApKFDujOGZtCBDUGiFNUeiY3elahLivYYzTYEtINQ56+YOcdEBv2GE3hBQ8/li2WUttCLNsHv9/y7WInmbKw4KecoPJoGCXUF2APTeh1dDvk9WD0nMYVixECZn3ppnMehD2WXs/eXvbwdZi+eTD7eNmj4J2+8vPZWkSKyEDqRSbIWNRs5W9QL7odOa6/Ya8XYXWGnq6mtw9saoz4tfzLjasr47FindcurzELa+bJufGDYfCOJ/wN5jev2Sj2z9DBLlnahnxH1dd4sBpbecGjJ/Y6r23SILx2GnIB0chJ2yVNSRJfBspuPQyynJWzXStTTURkt+6veDDiIVSJ8P9cvEFxvEihin2r5zYbsa2nlJ8+dPw/awF1wKOL0R2A9fhuVEUcKvce1UKNJ36JRsjnRcPtR6CWdN1LdtnPicRZpO+6w7ZlpDQEbswyGMteV+cjWx/JFWIo4olnj3MIVolwSLqjVIZ1XAL3zeV4UJVjyN87UaIeti1qiiXDFUL6Sxpt+SmKsYY+/9+AooGl6P+GGGm4uhW+CZpRktBQ/tBd0gqsVElfUvqic/z4LdUXcbpB7wrxEWIPmNSBXiLRDrOe3WaugOM7kOLzcOw1T/Zh4xC7Wp5o2TM++nnjztlRApyCeC5AZoTptu5GhoPjT/IkIiwbP2tsy4vwgU8Tw7E1PA0obXk03egPfLc4vq6hRZMyoyF34JTfeSd+EEKHFqZtxR7MWwQmGCueqxmu6rP9Ev9dJku8JuT2i351gWlb7+sDqOciYTVv16MTGgN2wQ+3HqiECQsTO2Gu9M4xaSLd2nOiiMAQYjChMM7ohlcwOLvm1f9Ue5HvUPjLGSG9C6JHxCqMOHCDnBsJu3gJbrQM2QKSUnP9QamHgRSHsAwhPN3SNPdz4Jwaj2f6Ci1GgGoLgCrIm4SrXMMEOKG86vhDLYAUfXe7+YqnhmeEn3geE8rRdjf3/ygtLJ+GJa67xiaEHHrS0Zr8wFpzEu4w5RL4Xw8p0CKDidey6rg+AtyMf8X5k39sL7HdcPIJ3GjYcKP0Cy6mn44H+iF+V8HRHOXp2y4nU3m6bDuP4AwXZIXMk1+X8121t06pssfXE+GnEi/KQoWuS84rXmJp28JU14RFmE30gqU4QCfj4DxgYcZ30u6X2S2PJ/8mLfYokydOrbmEc1brbO9IAIEcGoI+RAti3k24wETWEBTb/7RDpLXnnNsyJsipY0SsR4tWNCXmqxMAytfmht/6t8zxLGc66Wx0T3DjXWltoblbLbWs09Pyb3Kiz2NlyIiJ3MoANJQSyZu/YxWPNKfrUrU+7SXKGmcRQNUEPxH7nLEdBJWGiMkQ9/tzf3Z1TyOxP/2nmf3c2rDN2G5WqDMeDeNSIi3g7EG5Xq9oBuWZyoI5t4HsWBzQgmdWu1dowEj4sVpRO/gmRBtLMTR/aOuUHQxKHSFXIJGo5i37vbq8SAr/ysIFJduP2MqyJaaaAY1ixn6Dj6IsCHgCzMC+xFSCT6j8reSFJtGnergoSHTiUkLBLW2mfv8kwIj8X721SvnDJZEIsGyaJ14gzrIiv6hSKS7KqV7RcuYAsgqdpr3SLOGVuiWpuAsY3oGSZXk0P9MGyhGin7NLSm1IcAq+/SL5tw8wSx/CNd67hGWNjlfKFGIoxLDZBkKK8V3v8Np/C0/SDzPrl5CxaaY7yNHr7Kt5WGL/GZGRezbZZAURGhYkh0wN8ShWgjOr0Pn1GXV4jAreV3rA+VrCtKl75Mjj3uri4PM5YdHbWaTRnBCxmU0tSSO8ktNrR84oezY2z5qrcSfCzAzh+vwLoiA0C2MyRUr38r8MHqVNAjizQgWc+3yB5LhpGuIskxSQja0K/w25Fbr28vn88ZgEg9FMm3NKFB0Got9wpnfeCOcUd5BbPlqco6qFP7Oc7k8AId8bM3HvRJ7fJGEs4gxS3WL6UCaEExO9rh5RToLF/pG3htHTVttbltYDPJOkJXeUk+yneN6XNtxGE9Kdd6+ahpq7jMmStOBQ3jb0hTKnPQMyZ6wWpjUONsxBL2lUDIPFbjXdKUI25unCh4u59zZu0GrPd4VT73lMabQeWX6Tm4zb+xoNORd3qGYCEfEe5+1/kjRlWkWb+pmbNtjJ98BN1jmncXlpHou6Db4Ybg6eFvDJr2QKwkHkL6WWlOy3Mgyd78rY2Mzz46AM6tOsBrlVo0g0uPIFGWt8xfIo/2Xn49Sjbqh0Lv1VjDKc49/V0G0d1HCIqXXe7I37saTfK5e1xSizQ+d2aYNbYzqRqNyXbblVl2P9ZmWdFiScvSuZ7KeOrLy14KPUhUuBPhv5ZtZ0RpoxAWsLKbu1AgfSwXyyqQ2SYO5jJqZ9EA2xCFUmgcmBYOQ/OtqlWd6kvJuLXZnlRhCN4UBNkUzQcIuRT1sWpUVQVRw0TVfnaZVB225CkkZEd/+SarwsH9J+wXup8Wg2bhZanTUA3uf3maeSwPVaomcGf25j7O0mrOS5KsRjOZmMVIZFE4z7QyOh9WOzaiEJkoxbkAO6oXM8WLPNp7xmo+yMXP1Kziz4KKnKST9rbyAdavmhuxuM8H9XVD1AuR+l3tKsrCQVRgcQPDMQ/6OBT2dmQOhTzAWrlqvUUExrqj4Uk1gh2If3gBfKEmHObjDnDr9x6N3/BXVXyYDwxf9ifSA+Oxy+/5X2cKCc3nEmZL3kCJHjpmz4JtRSrt4nT3AwgJdsdOR5ZJJ+Pq2qk6uISVK048gFzQ1ubV7KVkbeeVh+gy/CDaeuBqWlb8FgPlPgiN5qLdZaGVLdaqXqOXYCq+gM4En4J2SXiF9fatht2HkoFUi/SSQhZfs35lOgh0QiaSBl5ZnU+0zBVtMGDMsbLuDHOh8ZVBUCLjvzR1HCDgmoxmL/rcUdrJbd2G0pxJyT8d2DMn3E+mJdRa2HdLOgXS6dwKLJiffvABXXUm2OpzgGund5J9QcJeFCg47RT+vewxrlb9MvXe8NyEckl6E4Sk0IkBs5MF2gQ4tAujHebRcJQNaMPOQqLLD7ni5B/NPCrrr1rT9hS2xSgK0bibeoJzyD7NIcgi2To/cuY/mLbr++2jOJvr3mBIOntzq1NTTi0Pne0vWMTlxU9d715dYUkPkRhIgd/vFap3PTo5SgkQLjZsZEnf5cQdwOhU5bBvBqjGdQ2I/C25ojY2zbZl0S1ZqiWqzyUKx/R8MShRBzIPvu7hI4mfDUap7xJCqaUMKHULTXa7bDdBQVB6XmGwQYiJkKLYsttlF3dCXbEvc4JsG6P4NxPAlVX+l4wToTVUvVOdexYXUCcYD95QLg0awHVBV0JAB/D2/8W9IkUkwEo1dSx5O5P3uunfjN5wWrmvs7YvhKnQVhVYRiY+oujctiOZ/M8HH0dpz93dq9/G4+cyIVnu1zp6Ko8hIFzbjNJNJQ9DpF5lZaqZUuNilftDH7vBVtX+UBghEi+w8fAAwlsfgwuBgepCZrRT21o6KigxUmEJO8tmmdam6ka9mfb2nDZPIXxWxu2PWzK/bvUb1w/8O5W2kGO6l02tVcIgvdGTXEkNB3LF6se3+g7FZLWdz9PDSa3Njr09B04votLIqg3AISjuzcsnKnNX/LNd99ylqyOj8fpucdGZmvcokURYRFzFRm+/SKRDGn+uEVO8NxIKR2gMyHG7RdlZi1z9nRiy9c05dJc2Sh++VoGJmm4bcOl4LZRQ8CGtEvl8CGilJEAdDQHD23B643dSuIggATnqibFzB7thO+xQ1yUjMfilP0lYIkdho0fr1rMF68H8Ds0lDbj/deO7eaXxjacxsBjhOHhYShkK5vr/zeCYkCilDcMEDuLe6JHkl/ua2g9KbaTMs1/Qrj13am9u2XkC5dsysISL6Oud/9dUFg6alADnkf6za2GuGP8EQqFeaHiqiPR4qU+z184GWCgZZgdMhcZp6h/W3mUtY+yF4Elv4TZ6kG1qQ/+UEeP8NewQIvYf5U57wrK8Nu7QTA1UhGrQDu7cBLBUr5e/M/KVt9hVIjppHjciMW7//KfOej9yqJrFTpPtASvA3kWz50e8LduGrJucwlmIOQoHSsRYVjo0AHoWpNigz13WkLkmtT/Ze3RSkOdUijWvEmmu/InPBmmJuzX0PCOGea7lTjaYANn3Q2N13zNX3kHZwKyhQt6KR0zl+lHbTnOCPZI/vVWpub4wM1hudZzCWOfGb0YRgv9CdUqvrewIkW7uAuRE1FkXTP1El37BQS/JgfIF9WwdCd6OPaLrsr0CE1NqrphEUHs23ItZ1AD117y8z9yW5gbQLL/TFKS4pRDKG+H/pheunAzJxPgy61zTzgFh+Eh1azzVuALVC33ov2qTnTEMXctsLgqGLjodm9zt4oQ4QN2Wn2jenYw/1687GKEParXViD/O3Q24mOzkWNCDqBj37gq/on+V1iMvofHWkdaBzdrQw5Sv6wABMXpY7pCkuvtI/zxcJKIEg+8Wg2pRrOqiEUnEePkKZ1W89ICcziIvfk9Thy80PydGbcLtZQ2axwtcU+h1DRD3tw="
   dns_validation     = "5TInayJV2-k1aEg0zhwJWQALCWVLGHcKBs83rHdGU54"
   keybase_validation = "keybase-site-verification=fI_s0HjMznP9oeK_le26opYH3ndOpT8LLXDX7gGvOQQ"
-
-  molly_domain            = "mollycollins.me"
-  molly_site_verification = "mtmCg2g38sykzwGdsIwCnjkbpL3h-dWpwR7gJQwhBOw"
-  molly_dns_validation_1  = "aKSXLqHwee4hxQNwphtJEolZ8roHvPvvV8XOPcYygVc"
-  molly_dns_validation_2  = "smDATBvrWGxMVRXjdWTdA1BI5cq89fqsMCWQJJUQMkw"
 }
 
 data "aws_caller_identity" "current" {}

terraform/route53.tf

@@ -1,8 +1,7 @@
 module "zones" {
   source = "terraform-aws-modules/route53/aws//modules/zones"
   zones = {
-    (local.domain_name)  = {}
-    (local.molly_domain) = {}
+    (local.domain_name) = {}
   }
 }
 
@@ -14,18 +13,11 @@ locals {
       type    = dvo.resource_record_type
     }
   ]
-  molly_records = [
-    for dvo in aws_acm_certificate.molly.domain_validation_options : {
-      name    = dvo.resource_record_name
-      records = [dvo.resource_record_value]
-      type    = dvo.resource_record_type
-    }
-  ]
 }
 
 module "records" {
-  source    = "terraform-aws-modules/route53/aws//modules/records"
-  zone_name = local.domain_name
+  source  = "terraform-aws-modules/route53/aws//modules/records"
+  zone_id = module.zones.route53_zone_zone_id[local.domain_name]
 
   records = [
     {
@@ -79,43 +71,3 @@ module "records" {
 
   depends_on = [module.zones]
 }
-
-module "records_molly" {
-  source    = "terraform-aws-modules/route53/aws//modules/records"
-  zone_name = local.molly_domain
-  records = [
-    {
-      name    = "www"
-      type    = "CNAME"
-      records = [local.molly_domain]
-      ttl     = 3600
-    },
-    {
-      name               = local.molly_records[0].name
-      records            = local.molly_records[0].records
-      type               = local.molly_records[0].type
-      full_name_override = true
-      ttl                = 300
-    },
-    {
-      name    = "google-site-verification"
-      type    = "TXT"
-      records = [local.molly_site_verification]
-      ttl     = 3600
-    },
-    {
-      name = ""
-      type = "MX",
-      records = [
-        "1 aspmx.l.google.com",
-        "5 alt1.aspmx.l.google.com",
-        "5 alt2.aspmx.l.google.com",
-        "10 alt3.aspmx.l.google.com",
-        "10 alt4.aspmx.l.google.com"
-      ]
-      ttl = 1800
-    }
-  ]
-
-  depends_on = [module.zones]
-}