From e2c439deef10303391452f0566dde8468bff794b Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Wed, 4 Sep 2024 21:14:50 +0200
Subject: [PATCH] fix: Add missing records

---
 terraform/domains.tf   | 47 ------------------------------------------
 terraform/uberspace.tf | 22 ++++++++++++++++----
 2 files changed, 18 insertions(+), 51 deletions(-)

diff --git a/terraform/domains.tf b/terraform/domains.tf
index 6e085d6..e5cc81a 100644
--- a/terraform/domains.tf
+++ b/terraform/domains.tf
@@ -15,16 +15,6 @@ resource "inwx_domain_contact" "admin" {
   email          = var.admin_email
 }
 
-# resource "inwx_nameserver" "twomartens_de_nameserver" {
-#   domain = local.domain
-#   type   = "MASTER"
-#   nameservers = [
-#     "ns.inwx.de",
-#     "ns2.inwx.de",
-#     "ns3.inwx.eu"
-#   ]
-# }
-
 resource "inwx_domain" "twomartens_de" {
   name = local.domain
   nameservers = [
@@ -67,30 +57,6 @@ resource "inwx_domain" "twomartens_eu" {
 }
 
 // NS records
-# resource "inwx_nameserver_record" "twomartens_de_ns1" {
-#   domain  = local.domain
-#   name    = local.domain
-#   content = "ns.inwx.de"
-#   type    = "NS"
-#   ttl     = 86400
-# }
-#
-# resource "inwx_nameserver_record" "twomartens_de_ns2" {
-#   domain  = local.domain
-#   name    = local.domain
-#   content = "ns2.inwx.de"
-#   type    = "NS"
-#   ttl     = 86400
-# }
-#
-# resource "inwx_nameserver_record" "twomartens_de_ns3" {
-#   domain  = local.domain
-#   name    = local.domain
-#   content = "ns3.inwx.eu"
-#   type    = "NS"
-#   ttl     = 86400
-# }
-
 resource "inwx_nameserver_record" "twomartens_eu_ns1" {
   domain  = "2martens.eu"
   name    = "2martens.eu"
@@ -116,19 +82,6 @@ resource "inwx_nameserver_record" "twomartens_eu_ns3" {
 }
 
 // SOAs
-
-# resource "inwx_nameserver_record" "twomartens_de_soa" {
-#   domain  = local.domain
-#   name    = local.domain
-#   content = "ns.inwx.de hostmaster.inwx.de 2023103008 10800 3600 604800 3600"
-#   type    = "SOA"
-#   ttl     = 86400
-#
-#   lifecycle {
-#     ignore_changes = [content]
-#   }
-# }
-
 resource "inwx_nameserver_record" "twomartens_eu_soa" {
   domain  = "2martens.eu"
   name    = "2martens.eu"
diff --git a/terraform/uberspace.tf b/terraform/uberspace.tf
index 13cfbe7..55af103 100644
--- a/terraform/uberspace.tf
+++ b/terraform/uberspace.tf
@@ -55,8 +55,8 @@ module "personal_website_domain" {
   ipv6        = "2a00:d0c0:200:0:b9:1a:9c:40"
   hasMXRecord = true
   hostName    = "howell.uberspace.de"
-  mxPrio      = 10
-  mxSpf       = "v=spf1 include:spf.uberspace.de"
+  mxPrio      = 0
+  mxSpf       = "v=spf1 include:spf.uberspace.de ~all"
 }
 resource "inwx_nameserver_record" "twomartens_de_google-verification_txt" {
   domain  = local.domain
@@ -76,14 +76,28 @@ module "nextcloud_domain" {
   hasMXRecord = true
   hostName    = "kushida.uberspace.de"
   mxPrio      = 0
-  mxSpf       = "v=spf1 mx ~all"
+  mxSpf       = "v=spf1 include:spf.uberspace.de ~all"
 }
 
 // domain key
-resource "inwx_nameserver_record" "twomartens_de_uberspace-domainkey_txt" {
+resource "inwx_nameserver_record" "id_twomartens_de_uberspace-domainkey_txt" {
   domain  = local.domain
   name    = "uberspace._domainkey.id.2martens.de"
   content = "v=DKIM1;t=s;n=core;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqs3bFL8W77z7VJHCFbsJ3o68Y1uBbVsbIS1y35CMfRv6wp7si7aIG2ZeKqzdh2dTMsvtvSMaYVq1gT/EtRmTbU/BYC21ff8sqcVqn/ll5nNsk5jKWXTYAlTQp4LBQN7icw94ZNGr5/SDYcnv2nsBYFf2GUviObWXGHX4RaBFNj9NVUNWNin/HicvW+LsbfYq37QtlhjmUn9K96VCwKcTV1mx+Ek0osErYefcOVNawqWIlVRQDLkHZhk1StLsOpRqV+qEjhzTk4n4ZiNtLJG1D9CpHl24d5DKsQDyVFdEfqHimFTSNgiitlkuXg+i+NMiRA9G3gNJtvw8uvfN8f+stQIDAQAB"
   type    = "TXT"
   ttl     = 3600
+}
+resource "inwx_nameserver_record" "cloud_twomartens_de_uberspace-domainkey_txt" {
+  domain  = local.domain
+  name    = "uberspace._domainkey.cloud.2martens.de"
+  content = "v=DKIM1;t=s;n=core;p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlypkJd9u7bveoaAMhTM9sFY8sAmZJRg4pWtrPvNNKyF4M53Lid41Vx5nLuAsJ8zSQ+eOYW0SvMBBS8pGF/yS/qgPj3vPCTHxwjKW9AK3Cz6zP2LTdWzsfZv5Tnms2nvVIy2VQf5fAWg1H+t6Bfofcy69lQ7kv2F1/IrWmkLOoYT1dgBMWwoOOr5vGmNlgTlJ0PyU+K2jD+0L+0+G3Ks+94mLFVgOtPCjuwBjtQGY/qmKo+h9/K0LypbD5fgnBgZuzjN2i9B647UmynmRPJVeA6mGqlcHPqi6RISrny8d6I2o009UhvxsgsyVzEePICiNHO7fBJh+uux1zihGurToZn9laNzdTm50hifshk4rTQyEFjNHfDApxu61pWo94A6ovBrwbecJxVl52Une1hZgusD6v2X3sj0du5BdzaOL2AwIxFqwxhSBgNEENHpV5LU8Cu4R1Puwe9uqrjLomuG+4MWFtpfWuYX2O60eG/NRAJBeBBnGNxaepMmgoRJZ4HYlM2wyg6DzhZapFVXOcRANgn8933yrl5IVfgGLuoDWw+q9r/SRk2bhjyUejG3J8ivdayKzLEYIaEyzeTgawR/sVHPI/6yMdYzjtxtzq7yiPyv5QapJq/mtwO8aU+ANU3LB4eeZ187hFkE2k3TroFBYVV6a4UX4Qh4OlnHCk7Fgy/kCAwEAAQ=="
+  type    = "TXT"
+  ttl     = 3600
+}
+resource "inwx_nameserver_record" "twomartens_de_uberspace-domainkey_txt" {
+  domain  = local.domain
+  name    = "uberspace._domainkey.2martens.de"
+  content = "v=DKIM1;t=s;n=core;p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3inJYRQRdWD0NQf9WRVcct8Z+GF74WYCK9Q9E/hl9qRSrqHLbm4AZ8gDWZDUQ7O0WbsQ4wcBa2SLB0znpW2UmVrp0iMhqGXVU5USWTHLgAPOVo9DKKbY5wCuugftQe99hvW1Z5BNhzvGUczknQHW/oZF/a7l1nwkYuAZ9YyzQY+sB8o3euuZ0QxaVde0UNDMGpjUO/Nd8MRZj1WBNNyy12ppKVskg7GzuVpulkskslM/mAWdTJ7HKZh1HHPjjGS2ttyDMGWU7/sxuenZ5Z46PvKWQ37djwEsXqXuqYrLI+QBoefolhisHNhHA9cwuUU3bq/+zXhLTN4bYZVPeV31mM6cguKJibPXg0HgYUImJ0A/sADYcd4q7ryZ/sAzCydPT4FDrx64apRPlaIhugSU1KCz+N+7UtCjrQaJLA8i/F4+krfZpfiYr5MJrI8jTAZFW9lzGL7NTVLe1yDf/9aJGc7R/TyI/c5uGFGUnu0C+AKC5KJCIf/I2hJ9ARRRzKe1RtmiTJMAxi8FqzRQoEQwfSDi+vGXtrUC4JCV2Zh7xgwmZV+lMiP5M6x3aOM7FI26WPx+7tdRlzWiYu7okS5ayAgu26EYoKjGuWWHGUuKSKNqjTy3oBunZv3LzdnhOAn4eOrE7+2qn8hiL8SLa9oGcUv1BI0KQmopIAY+BiaX6JkCAwEAAQ=="
+  type    = "TXT"
+  ttl     = 3600
 }
\ No newline at end of file