Add vps_ prefix to existing resources

2 files changed, 20 insertions, 20 deletions

diff --git a/.envrc b/.envrc
index c4e83d6..89b9d04 100644
--- a/.envrc
+++ b/.envrc
@@ -10,15 +10,15 @@ export TLD
 #
 # Terraform
 #
-export TF_VAR_tld="$TLD"
-export TF_VAR_hostname="$VPS_HOSTNAME"
-export TF_VAR_storage_name="sovereignty-storage"
+export TF_VAR_vps_tld="$TLD"
+export TF_VAR_vps_hostname="$VPS_HOSTNAME"
+export TF_VAR_vps_storage_name="sovereignty-storage"
 
-TF_VAR_vultr_api_key="$(cat ./secrets/terraform/vultr-api-key.txt)"
+TF_VAR_vultr_api_key="$(cat ./secrets/terraform/vultr-api-key.txt ||:)"
 export TF_VAR_vultr_api_key
 
-TF_VAR_dkim_public_key="$(head -n -1 < ./secrets/mail/dkim/tld.pub | tail -n +2 | tr -d '\n')"
-export TF_VAR_dkim_public_key
+TF_VAR_vps_dkim_public_key="$(head -n -1 < ./secrets/mail/dkim/tld.pub | tail -n +2 | tr -d '\n')"
+export TF_VAR_vps_dkim_public_key
 
 # Selector: date when it was created
 export TF_VAR_dkim_selector='20201126'
diff --git a/vps.tf b/vps.tf
index 3f56681..2721c56 100644
--- a/vps.tf
+++ b/vps.tf
@@ -15,22 +15,22 @@ variable "vultr_api_key" {
   description = "Vultr API key."
 }
 
-variable "tld" {
+variable "vps_tld" {
   type        = string
   description = "Root Top-Level Domain. Subdomains will be derived from it."
 }
 
-variable "hostname" {
+variable "vps_hostname" {
   type        = string
   description = "Human name of the host. This is a pet name, not cattle name :)"
 }
 
-variable "dkim_public_key" {
+variable "vps_dkim_public_key" {
   type        = string
   description = "Public key for the DNS TXT DKIM record."
 }
 
-variable "dkim_selector" {
+variable "vps_dkim_selector" {
   type        = string
   description = "The DKIM selector that prefixes the domain in the TXT record."
 }
@@ -46,32 +46,32 @@ provider "vultr" {
 resource "vultr_instance" "vps_server" {
   enable_ipv6      = true
   backups          = "enabled"
-  hostname         = var.hostname
+  hostname         = var.vps_hostname
   activation_email = true
-  label            = var.hostname
+  label            = var.vps_hostname
   region           = "cdg"
   plan             = "vc2-1c-1gb"
   # $ curl -H "Authorization: Bearer $TF_VAR_vultr_api_key" https://api.vultr.com/v2/snapshots  | jq
   snapshot_id = "8e6aaab6-7973-48a0-aeb5-cb99ab1ff43d"
 }
 
-output "public_ipv4" {
+output "vps_public_ipv4" {
   value = vultr_instance.vps_server.main_ip
 }
 
-output "public_ipv6" {
+output "vps_public_ipv6" {
   value = vultr_instance.vps_server.v6_main_ip
 }
 
 # DNS and IP configuration
 
 locals {
-  mail_domain = "mail.${var.tld}"
+  mail_domain = "mail.${var.vps_tld}"
 }
 
 resource "vultr_dns_domain" "vps_tld" {
   # The CNAME record is already generated by Vultr
-  domain = var.tld
+  domain = var.vps_tld
   ip     = vultr_instance.vps_server.main_ip
 }
 
@@ -117,15 +117,15 @@ resource "vultr_dns_record" "vps_spf_txt" {
 
 resource "vultr_dns_record" "vps_dkim_txt" {
   domain = vultr_dns_domain.vps_tld.id
-  name   = "${var.dkim_selector}._domainkey"
-  data   = "\"v=DKIM1;k=rsa;p=${var.dkim_public_key}\""
+  name   = "${var.vps_dkim_selector}._domainkey"
+  data   = "\"v=DKIM1;k=rsa;p=${var.vps_dkim_public_key}\""
   type   = "TXT"
 }
 
 resource "vultr_dns_record" "vps_dmarc_txt" {
   domain = vultr_dns_domain.vps_tld.id
   name   = "_dmarc"
-  data   = "\"v=DMARC1;p=none;pct=100;rua=mailto:postmaster@${var.tld};\""
+  data   = "\"v=DMARC1;p=none;pct=100;rua=mailto:postmaster@${var.vps_tld};\""
   type   = "TXT"
 }
 
@@ -134,6 +134,6 @@ resource "vultr_dns_record" "vps_dmarc_txt" {
 # resource "vultr_dns_record" "vps_cname_start_alias" {
 #   domain = vultr_dns_domain.vps_tld.id
 #   name   = "*"
-#   data   = var.tld
+#   data   = var.vps_tld
 #   type   = "CNAME"
 # }