Update DKIM and DMARC configurations for a13labs.me and alexpires.me; add new variables for DKIM values

terraform/iac/a13labs.me.tf

@@ -42,7 +42,7 @@ resource "cloudns_dns_record" "a13labs_me_dkim" {
   name  = "${var.scaleway_dkim_key}._domainkey"
   zone  = local.a13labs_me_zone
   type  = "TXT"
-  value = "v=DKIM1; h=sha256; k=rsa; p=${var.scaleway_dkim_value}"
+  value = "v=DKIM1; h=sha256; k=rsa; p=${var.a13labs_me_scaleway_dkim_value}"
   ttl   = "3600"
 }
 
@@ -50,7 +50,7 @@ resource "cloudns_dns_record" "a13labs_me_dmarc" {
   name  = "_dmarc"
   zone  = local.a13labs_me_zone
   type  = "TXT"
-  value = "v=DMARC1; p=none; rua=mailto:admin@${local.a13labs_me_zone}"
+  value = "v=DMARC1; p=none; rua=mailto:postmaster@${local.a13labs_me_zone}"
   ttl   = "3600"
 }
 

terraform/iac/alexpires.me.tf

@@ -98,7 +98,7 @@ resource "cloudns_dns_record" "alexpires_me_dkim" {
   name  = "${var.scaleway_dkim_key}._domainkey"
   zone  = local.alexpires_me_zone
   type  = "TXT"
-  value = "v=DKIM1; h=sha256; k=rsa; p=${var.scaleway_dkim_value}"
+  value = "v=DKIM1; h=sha256; k=rsa; p=${var.alexpires_me_scaleway_dkim_value}"
   ttl   = "3600"
 }
 
@@ -106,7 +106,7 @@ resource "cloudns_dns_record" "alexpires_me_dmarc" {
   name  = "_dmarc"
   zone  = local.alexpires_me_zone
   type  = "TXT"
-  value = "v=DMARC1; p=none; rua=mailto:admin@${local.alexpires_me_zone}"
+  value = "v=DMARC1; p=none; rua=mailto:postmaster@${local.alexpires_me_zone}"
   ttl   = "3600"
 }
 

terraform/iac/sectool.env

@@ -6,7 +6,8 @@ TF_VAR_scaleway_project_id=$SCALEWAY_PROJECT_ID
 TF_VAR_scaleway_organization_id=$SCALEWAY_ORGANIZATION_ID
 TF_VAR_scaleway_user_id=$SCALEWAY_USER_ID
 TF_VAR_scaleway_dkim_key=$SCALEWAY_DKIM_KEY
-TF_VAR_scaleway_dkim_value=$SCALEWAY_DKIM_VALUE
+TF_VAR_alexpires_me_scaleway_dkim_value=$ALEXPIRES_ME_SCALEWAY_DKIM_VALUE
+TF_VAR_a13labs_me_scaleway_dkim_value=$A13LABS_ME_SCALEWAY_DKIM_VALUE
 TF_VAR_contabo_client_id=$CONTABO_CLIENT_ID
 TF_VAR_contabo_client_secret=$CONTABO_CLIENT_SECRET
 TF_VAR_contabo_api_password=$CONTABO_API_PASSWORD

terraform/iac/variables.tf

@@ -87,8 +87,14 @@ variable "scaleway_dkim_key" {
   sensitive   = true
 }
 
-variable "scaleway_dkim_value" {
-  description = "Scaleway DKIM value"
+variable "alexpires_me_scaleway_dkim_value" {
+  description = "Scaleway DKIM value (alexpires.me)"
+  type        = string
+  sensitive   = true
+}
+
+variable "a13labs_me_scaleway_dkim_value" {
+  description = "Scaleway DKIM value (a13labs.me)"
   type        = string
   sensitive   = true
 }