From b16f89357b8d9389869461899a040ad2143bafae Mon Sep 17 00:00:00 2001 From: "Rasmus \"Pez\" Wejlgaard" Date: Sun, 29 Mar 2026 21:33:50 +0100 Subject: [PATCH] replace hard set ip with vars (#25) * replace hard set ip with vars * run all PR checks every time --- .github/workflows/lint-ansible.yml | 3 --- .github/workflows/lint-docker-compose.yml | 7 ------- .github/workflows/terraform.yml | 4 ---- .github/workflows/validate-caddyfile.yml | 7 ------- .github/workflows/validate-terraform.yml | 7 ------- terraform/cloudflare_dns.tf | 6 +++--- 6 files changed, 3 insertions(+), 31 deletions(-) diff --git a/.github/workflows/lint-ansible.yml b/.github/workflows/lint-ansible.yml index 5d18ee2..28d6810 100644 --- a/.github/workflows/lint-ansible.yml +++ b/.github/workflows/lint-ansible.yml @@ -2,9 +2,6 @@ name: Lint Ansible on: pull_request: - paths: - - 'ansible/**' - - '.github/workflows/lint-ansible.yml' jobs: ansible-lint: diff --git a/.github/workflows/lint-docker-compose.yml b/.github/workflows/lint-docker-compose.yml index 9e38115..dabcd35 100644 --- a/.github/workflows/lint-docker-compose.yml +++ b/.github/workflows/lint-docker-compose.yml @@ -1,14 +1,7 @@ name: Lint Docker Compose on: - push: - paths: - - 'ansible/services/**' - - '.github/workflows/lint-docker-compose.yml' pull_request: - paths: - - 'ansible/services/**' - - '.github/workflows/lint-docker-compose.yml' jobs: compose-lint: diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index dfc3be1..1b461c7 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -6,10 +6,6 @@ on: paths: - 'terraform/**' - '.github/workflows/terraform.yml' - pull_request: - paths: - - 'terraform/**' - - '.github/workflows/terraform.yml' # Requires these repository secrets: # AGE_SECRET_KEY — age private key for SOPS decryption diff --git a/.github/workflows/validate-caddyfile.yml b/.github/workflows/validate-caddyfile.yml index 8d7fbba..5ba8f6b 100644 --- a/.github/workflows/validate-caddyfile.yml +++ b/.github/workflows/validate-caddyfile.yml @@ -1,14 +1,7 @@ name: Validate Caddyfile on: - push: - paths: - - 'ansible/services/caddy/**' - - '.github/workflows/validate-caddyfile.yml' pull_request: - paths: - - 'ansible/services/caddy/**' - - '.github/workflows/validate-caddyfile.yml' jobs: caddy-validate: diff --git a/.github/workflows/validate-terraform.yml b/.github/workflows/validate-terraform.yml index 5dfb946..a0c9450 100644 --- a/.github/workflows/validate-terraform.yml +++ b/.github/workflows/validate-terraform.yml @@ -1,14 +1,7 @@ name: Validate Terraform on: - push: - paths: - - 'terraform/**' - - '.github/workflows/validate-terraform.yml' pull_request: - paths: - - 'terraform/**' - - '.github/workflows/validate-terraform.yml' jobs: tofu-validate: diff --git a/terraform/cloudflare_dns.tf b/terraform/cloudflare_dns.tf index 44c1da2..657509c 100644 --- a/terraform/cloudflare_dns.tf +++ b/terraform/cloudflare_dns.tf @@ -130,7 +130,7 @@ resource "cloudflare_dns_record" "mail-a" { zone_id = cloudflare_zone.pez-sh.id name = "mail" type = "A" - content = "167.235.134.154" + content = hcloud_server.nuremberg-a.ipv4_address proxied = false ttl = 1 } @@ -296,7 +296,7 @@ resource "cloudflare_dns_record" "mail-aaaa" { zone_id = cloudflare_zone.pez-sh.id name = "mail" type = "AAAA" - content = "2a01:4f8:1c1e:9c53::1" + content = hcloud_server.nuremberg-a.ipv6_address proxied = false ttl = 1 } @@ -382,6 +382,6 @@ resource "cloudflare_dns_record" "root-txt-spf" { zone_id = cloudflare_zone.pez-sh.id name = "@" type = "TXT" - content = "v=spf1 ip4:167.235.134.154 ip6:2a01:4f8:1c1e:9c53::1 -all" + content = "v=spf1 ip4:${hcloud_server.nuremberg-a.ipv4_address} ip6:${hcloud_server.nuremberg-a.ipv6_address} -all" ttl = 1 }