Skip to content

Terraform cleanup #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ethnt merged 2 commits into from
Sep 14, 2026
Merged

Terraform cleanup #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
461aebd
Remove dead Terraform code
ethnt Sep 12, 2026
6e40e90
Finish cleaning up Terraform
ethnt Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 39 additions & 24 deletions deploy/terraform/certificates.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
variable "acme_staging_directory" {
default = "https://acme-staging-v02.api.letsencrypt.org/directory"
type = string
}

variable "acme_production_directory" {
default = "https://acme-v02.api.letsencrypt.org/directory"
type = string
}

variable "acme_tos" {
default = "https://letsencrypt.org/documents/LE-SA-v1.4-April-3-2024.pdf"
type = string
}

resource "proxmox_virtual_environment_acme_account" "anise_staging" {
provider = proxmox.anise

name = "staging"
contact = "admin@e10.camp"
directory = "https://acme-staging-v02.api.letsencrypt.org/directory"
tos = "https://letsencrypt.org/documents/LE-SA-v1.4-April-3-2024.pdf"
contact = var.admin_email_address
directory = var.acme_staging_directory
tos = var.acme_tos
}

resource "proxmox_virtual_environment_acme_account" "anise_production" {
provider = proxmox.anise

name = "production"
contact = "admin@e10.camp"
directory = "https://acme-v02.api.letsencrypt.org/directory"
tos = "https://letsencrypt.org/documents/LE-SA-v1.4-April-3-2024.pdf"
contact = var.admin_email_address
directory = var.acme_production_directory
tos = var.acme_tos
}

resource "proxmox_virtual_environment_acme_dns_plugin" "anise_dns_plugin" {
Expand All @@ -32,18 +47,18 @@ resource "proxmox_virtual_environment_acme_account" "basil_staging" {
provider = proxmox.basil

name = "staging"
contact = "admin@e10.camp"
directory = "https://acme-staging-v02.api.letsencrypt.org/directory"
tos = "https://letsencrypt.org/documents/LE-SA-v1.4-April-3-2024.pdf"
contact = var.admin_email_address
directory = var.acme_staging_directory
tos = var.acme_tos
}

resource "proxmox_virtual_environment_acme_account" "basil_production" {
provider = proxmox.basil

name = "production"
contact = "admin@e10.camp"
directory = "https://acme-v02.api.letsencrypt.org/directory"
tos = "https://letsencrypt.org/documents/LE-SA-v1.4-April-3-2024.pdf"
contact = var.admin_email_address
directory = var.acme_production_directory
tos = var.acme_tos
}

resource "proxmox_virtual_environment_acme_dns_plugin" "basil_dns_plugin" {
Expand All @@ -62,18 +77,18 @@ resource "proxmox_virtual_environment_acme_account" "cardamom_staging" {
provider = proxmox.cardamom

name = "staging"
contact = "admin@e10.camp"
directory = "https://acme-staging-v02.api.letsencrypt.org/directory"
tos = "https://letsencrypt.org/documents/LE-SA-v1.4-April-3-2024.pdf"
contact = var.admin_email_address
directory = var.acme_staging_directory
tos = var.acme_tos
}

resource "proxmox_virtual_environment_acme_account" "cardamom_production" {
provider = proxmox.cardamom

name = "production"
contact = "admin@e10.camp"
directory = "https://acme-v02.api.letsencrypt.org/directory"
tos = "https://letsencrypt.org/documents/LE-SA-v1.4-April-3-2024.pdf"
contact = var.admin_email_address
directory = var.acme_production_directory
tos = var.acme_tos
}

resource "proxmox_virtual_environment_acme_dns_plugin" "cardamom_dns_plugin" {
Expand All @@ -92,18 +107,18 @@ resource "proxmox_virtual_environment_acme_account" "elderflower_staging" {
provider = proxmox.elderflower

name = "staging"
contact = "admin@e10.camp"
directory = "https://acme-staging-v02.api.letsencrypt.org/directory"
tos = "https://letsencrypt.org/documents/LE-SA-v1.4-April-3-2024.pdf"
contact = var.admin_email_address
directory = var.acme_staging_directory
tos = var.acme_tos
}

resource "proxmox_virtual_environment_acme_account" "elderflower_production" {
provider = proxmox.elderflower

name = "production"
contact = "admin@e10.camp"
directory = "https://acme-v02.api.letsencrypt.org/directory"
tos = "https://letsencrypt.org/documents/LE-SA-v1.4-April-3-2024.pdf"
contact = var.admin_email_address
directory = var.acme_production_directory
tos = var.acme_tos
}

resource "proxmox_virtual_environment_acme_dns_plugin" "elderflower_dns_plugin" {
Expand Down
76 changes: 0 additions & 76 deletions deploy/terraform/configuration.tf
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions deploy/terraform/email.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,3 @@ resource "aws_iam_user_policy_attachment" "mailer_ses_sender" {
user = aws_iam_user.mailer.name
policy_arn = aws_iam_policy.ses_sender.arn
}

# output "smtp_username" {
# value = aws_iam_access_key.mailer.id
# }

# output "smtp_password" {
# value = aws_iam_access_key.mailer.ses_smtp_password_v4
# sensitive = true
# }
5 changes: 0 additions & 5 deletions deploy/terraform/keys.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ resource "local_sensitive_file" "deploy_public_key" {
file_permission = "0600"
}

resource "aws_key_pair" "deploy_key" {
key_name = "generated-key-${sha256(tls_private_key.deploy_key.public_key_openssh)}"
public_key = tls_private_key.deploy_key.public_key_openssh
}

resource "tls_private_key" "builder_key" {
algorithm = "RSA"
}
Expand Down
11 changes: 0 additions & 11 deletions deploy/terraform/networking.tf
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions deploy/terraform/nixos.tf
View file
Open in desktop

This file was deleted.

122 changes: 74 additions & 48 deletions deploy/terraform/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,76 @@
terraform {
required_version = ">= 1.0"

required_providers {
aws = {
source = "hashicorp/aws"
version = "5.35.0"
}

local = {
source = "hashicorp/local"
version = "2.9.0"
}

tls = {
source = "hashicorp/tls"
version = "4.3.0"
}

tailscale = {
source = "tailscale/tailscale"
version = "0.24.0"
}

sops = {
source = "carlpett/sops"
version = "1.0.0"
}

proxmox = {
source = "bpg/proxmox"
version = "0.66.3"
}

improvmx = {
source = "issyl0/improvmx"
version = "0.7.1"
}

porkbun = {
source = "kyswtn/porkbun"
version = "0.1.3"
}

hcloud = {
source = "hetznercloud/hcloud"
version = "1.68.0"
}
provider "tailscale" {
oauth_client_id = data.sops_file.secrets.data["TAILSCALE_OAUTH_CLIENT_ID"]
oauth_client_secret = data.sops_file.secrets.data["TAILSCALE_OAUTH_CLIENT_SECRET"]
tailnet = data.sops_file.secrets.data["TAILSCALE_TAILNET"]
}

provider "aws" {
access_key = data.sops_file.secrets.data["AWS_ACCESS_KEY_ID"]
secret_key = data.sops_file.secrets.data["AWS_SECRET_ACCESS_KEY"]
region = "us-east-2"
}

provider "proxmox" {
alias = "anise"
endpoint = "https://anise:8006/"
username = data.sops_file.secrets.data["ANISE_PM_USERNAME"]
password = data.sops_file.secrets.data["ANISE_PM_PASSWORD"]
insecure = true

ssh {
agent = true
username = "deploy"
}
}

provider "proxmox" {
alias = "basil"
endpoint = "https://basil:8006/"
username = data.sops_file.secrets.data["BASIL_PM_USERNAME"]
password = data.sops_file.secrets.data["BASIL_PM_PASSWORD"]
insecure = true

ssh {
agent = true
username = "deploy"
}
}

provider "proxmox" {
alias = "cardamom"
endpoint = "https://cardamom:8006/"
username = data.sops_file.secrets.data["CARDAMOM_PM_USERNAME"]
password = data.sops_file.secrets.data["CARDAMOM_PM_PASSWORD"]
insecure = true

ssh {
agent = true
username = "deploy"
}
}

provider "proxmox" {
alias = "elderflower"
endpoint = "https://elderflower:8006/"
username = data.sops_file.secrets.data["ELDERFLOWER_PM_USERNAME"]
password = data.sops_file.secrets.data["ELDERFLOWER_PM_PASSWORD"]
insecure = true

ssh {
agent = true
username = "deploy"
}
}

provider "improvmx" {
token = data.sops_file.secrets.data["IMPROVMX_API_TOKEN"]
}

provider "porkbun" {
api_key = data.sops_file.secrets.data["PORKBUN_API_KEY"]
secret_api_key = data.sops_file.secrets.data["PORKBUN_API_SECRET"]
}

provider "hcloud" {
token = data.sops_file.secrets.data["HETZNER_API_TOKEN"]
}
2 changes: 1 addition & 1 deletion deploy/terraform/secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
data "sops_file" "secrets" {
source_file = "../../secrets.json"
source_file = "${path.module}/../../secrets.json"
}
Loading
Loading