From 1ec1d0f3c57873184f9a89875a0f86d11bda845f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Mon, 25 Dec 2023 19:22:30 +0100 Subject: [PATCH 01/36] update zones.yaml removed outputs --- outputs.tf | 6 --- zones.yaml | 108 +++++++++++++++++++++++++++-------------------------- 2 files changed, 55 insertions(+), 59 deletions(-) diff --git a/outputs.tf b/outputs.tf index 9848c28..e69de29 100644 --- a/outputs.tf +++ b/outputs.tf @@ -1,6 +0,0 @@ -output "zones" { - value = data.cloudflare_zone.zone -} -output "records" { - value = cloudflare_record.myrecord -} diff --git a/zones.yaml b/zones.yaml index 1ae4f91..432f5fe 100644 --- a/zones.yaml +++ b/zones.yaml @@ -1,68 +1,70 @@ -jan-ole.link: - a: - "@": 185.223.31.112 - www: 185.223.31.112 - leslie: 185.239.239.162 - "*.leslie": 185.239.239.162 - -ole.click: - a: - "@": 185.223.31.112 - www: 185.223.31.112 - share: 185.223.31.112 - "*.share": 185.223.31.112 - leslie: 185.239.239.162 - "*.leslie": 185.239.239.162 - -krewella.rocks: - a: - "@": 185.223.31.112 - www: 185.223.31.112 - leslie: 185.239.239.162 - "*.leslie": 185.239.239.162 - -jan-ole.tech: - a: - "@": 192.168.84.1 - www: 192.168.84.1 - leslie: 185.239.239.162 - "*.leslie": 185.239.239.162 - jan-ole.de: a: "@": 185.223.31.112 www: 185.223.31.112 "*.demo": 185.223.31.112 demo: 185.223.31.112 - "influx": 134.255.232.17 - "*.influx": 134.255.232.17 - status: 185.223.31.112 - "*.status": 185.223.31.112 - leslie: 185.239.239.162 - "*.leslie": 185.239.239.162 - lina: 134.255.232.17 - "*.lina": 134.255.232.17 - txt: - "@": v=spf1 redirect=icloud.com - "@/10": apple-domain=FsvGrRPoGf8wHqLU + server0: 185.239.239.162 + "*.server0": 185.239.239.162 + server1: 147.189.171.39 + "*.server1": 147.189.171.39 + influx: 185.239.239.162 + "*.influx": 185.239.239.162 + server3: 45.141.36.103 + "*.server3": 45.141.36.103 + portainer: 185.239.239.162 + "*.portainer": 185.239.239.162 + music: 147.189.171.39 + "*.music": 147.189.171.39 + usa.vpn: 181.214.240.124 + "*.usa.vpn": 181.214.240.124 + cname: + sig1_domainkey: sig1.dkim.jan-ole.de.at.icloudmailadmin.com mx: "@/10": mx01.mail.icloud.com "@/20": mx02.mail.icloud.com - cname: - sig1._domainkey: sig1.dkim.jan-ole.de.at.icloudmailadmin.com + txt: + "@": apple-domain=Q0mWxVlJtosPs2oy + "@/10": v=spf1 redirect=icloud.com include:icloud.com ~all -ole.pink: +huebner.coffee: + cname: + sig1._domainkey: "sig1.dkim.huebner.coffee.at.icloudmailadmin.com." + mx: + "@/10": "mx01.mail.icloud.com" + "@/20": "mx02.mail.icloud.com" + txt: + "@": "apple-domain=3xAfDPSkrnPyp6Y4" + "@/10": "v=spf1 include:icloud.com ~all" + +jan-ole.download: + a: + "@": 185.239.237.65 + www: 185.239.237.65 + "*": 185.239.237.65 fairy-feet.de: a: - "*": 134.255.232.17 - "@": 134.255.232.17 + "*": 147.189.171.39 + "@": 147.189.171.39 + +jan-ole.link: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + +ole.click: + a: + "@": 185.239.237.65 + www: 185.239.237.65 + +krewella.rocks: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + +jan-ole.tech: jan-ole.cloud: - a: - "*": 138.201.67.182 - "@": 138.201.67.182 - www: 138.201.67.182 - txt: - "*": v=spf1 a mx include:ole.click -all - "www": v=spf1 a mx include:ole.click -all \ No newline at end of file + +ole.pink: \ No newline at end of file From 9a1cbf4f949a1166cb2dce6a57b6c5482516e628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Sun, 14 Jan 2024 04:46:37 +0100 Subject: [PATCH 02/36] feat: update zones --- delete_records.sh | 22 ++++++++++++++++++++++ zones.yaml | 11 ++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 delete_records.sh diff --git a/delete_records.sh b/delete_records.sh new file mode 100644 index 0000000..a3d5ad7 --- /dev/null +++ b/delete_records.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +TOKEN="" +ZONE_ID= + +# EMAIL=me@gmail.com +# KEY=11111111111111111111111111 +# Replace with +# -H "X-Auth-Email: ${EMAIL}" \ +# -H "X-Auth-Key: ${KEY}" \ +# for old API keys + + +curl -s -X GET https://api.cloudflare.com/client/v4/zones/${ZONE_ID}/dns_records?per_page=500 \ + -H "Authorization: Bearer ${TOKEN}" \ + -H "Content-Type: application/json" | jq .result[].id | tr -d '"' | ( + while read id; do + curl -s -X DELETE https://api.cloudflare.com/client/v4/zones/${ZONE_ID}/dns_records/${id} \ + -H "Authorization: Bearer ${TOKEN}" \ + -H "Content-Type: application/json" + done + ) diff --git a/zones.yaml b/zones.yaml index 432f5fe..692f7f5 100644 --- a/zones.yaml +++ b/zones.yaml @@ -12,6 +12,8 @@ jan-ole.de: "*.influx": 185.239.239.162 server3: 45.141.36.103 "*.server3": 45.141.36.103 + server2: 134.255.232.17 + "*.server2": 134.255.232.17 portainer: 185.239.239.162 "*.portainer": 185.239.239.162 music: 147.189.171.39 @@ -64,7 +66,14 @@ krewella.rocks: www: 185.223.31.112 jan-ole.tech: + txt: + "@": 70dcbb22ee584668a5cef68b058043c3 jan-ole.cloud: -ole.pink: \ No newline at end of file +ole.pink: + +narilah.live: + a: + "@": 76.76.21.21 + www: 76.76.21.21 From 7b239483799401af87d7cf7bfa5c9c0b01729305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Sun, 3 Mar 2024 20:48:27 +0100 Subject: [PATCH 03/36] feat: update zones --- zones.yaml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/zones.yaml b/zones.yaml index 692f7f5..1e751d9 100644 --- a/zones.yaml +++ b/zones.yaml @@ -6,6 +6,8 @@ jan-ole.de: demo: 185.223.31.112 server0: 185.239.239.162 "*.server0": 185.239.239.162 + ganymede: 185.239.239.162 + "*.ganymede": 185.239.239.162 server1: 147.189.171.39 "*.server1": 147.189.171.39 influx: 185.239.239.162 @@ -20,8 +22,23 @@ jan-ole.de: "*.music": 147.189.171.39 usa.vpn: 181.214.240.124 "*.usa.vpn": 181.214.240.124 + palworld: 193.23.127.45 + "*.palworld": 193.23.127.45 + party: 147.189.171.39 + "*.party": 147.189.171.39 cname: sig1_domainkey: sig1.dkim.jan-ole.de.at.icloudmailadmin.com + vercel: cname.vercel-dns.com + hannah: jan-ole.synology.me + "*.hannah": jan-ole.synology.me + photos: jan-ole.synology.me + "*.photos": jan-ole.synology.me + paperless: hannah + "*.paperless": hannah + bliss: hannah + "*.bliss": hannah + streaming: jan-ole.synology.me + "*.streaming": jan-ole.synology.me mx: "@/10": mx01.mail.icloud.com "@/20": mx02.mail.icloud.com @@ -72,8 +89,18 @@ jan-ole.tech: jan-ole.cloud: ole.pink: - -narilah.live: a: - "@": 76.76.21.21 - www: 76.76.21.21 + "@": 185.239.239.162 + "*": 185.239.239.162 +narilah.live: + +cedricpump.de: + mx: + "@/10": "zap356617-2.plesk08.zap-webspace.com" + a: + "@": 185.239.237.65 + www: 185.239.237.65 + webmail: 185.239.237.65 + txt: + default_domainkey: "v=DKIM1; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqJZ/c83IQGBLOE0hFWM30cnlafqoJdf9a1qGvLPkhQEtFEYnpkeoVIwHRdgWjbkCg2HjYILTWdUSU81ZkvOdxI7OYJqp0sGPq96tZ6Lqve4hXZy6WVy7e1AKUYK9dRSiHSxfUdEd2X8V59Z6y34f4se0bzb4c3G1saLpic3xXliAQnOknmegfGjXPZuWelpoNUieWyCAtVOdVsUaKOQ/ApITGt9Sm/kRfwnSHweaiubxaUbCZUY+k4z4hK4mQLuJSulBBL5XCCYVo6AKI2wP9leVaC4MGXB11PalpxT6y/VrbM9uLzi0ayZsXnyhnxJhjVhoaXiubQF0HSkI3a6VRQIDAQAB;" + _domainkey: "o=-" \ No newline at end of file From 222f64dfa26f9ab3e31a7067d02f075d6601426e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Fri, 8 Mar 2024 19:46:33 +0100 Subject: [PATCH 04/36] feat: update zones --- zones.yaml | 53 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/zones.yaml b/zones.yaml index 1e751d9..547bea5 100644 --- a/zones.yaml +++ b/zones.yaml @@ -1,31 +1,44 @@ jan-ole.de: a: - "@": 185.223.31.112 - www: 185.223.31.112 - "*.demo": 185.223.31.112 - demo: 185.223.31.112 + #---servers + #server0-------------- server0: 185.239.239.162 "*.server0": 185.239.239.162 ganymede: 185.239.239.162 "*.ganymede": 185.239.239.162 - server1: 147.189.171.39 - "*.server1": 147.189.171.39 influx: 185.239.239.162 "*.influx": 185.239.239.162 - server3: 45.141.36.103 - "*.server3": 45.141.36.103 - server2: 134.255.232.17 - "*.server2": 134.255.232.17 portainer: 185.239.239.162 "*.portainer": 185.239.239.162 + + #server1-------------- + server1: 147.189.171.39 + "*.server1": 147.189.171.39 music: 147.189.171.39 "*.music": 147.189.171.39 + + #server2-------------- + server2: 134.255.232.17 + "*.server2": 134.255.232.17 + + #server3-------------- + server3: 45.141.36.103 + "*.server3": 45.141.36.103 + + #server4-USA---------- usa.vpn: 181.214.240.124 "*.usa.vpn": 181.214.240.124 + + #webspace0------------- + "@": 185.223.31.112 + www: 185.223.31.112 + "*.demo": 185.223.31.112 + demo: 185.223.31.112 + + #zap-gameserver palworld: 193.23.127.45 "*.palworld": 193.23.127.45 - party: 147.189.171.39 - "*.party": 147.189.171.39 + cname: sig1_domainkey: sig1.dkim.jan-ole.de.at.icloudmailadmin.com vercel: cname.vercel-dns.com @@ -35,8 +48,6 @@ jan-ole.de: "*.photos": jan-ole.synology.me paperless: hannah "*.paperless": hannah - bliss: hannah - "*.bliss": hannah streaming: jan-ole.synology.me "*.streaming": jan-ole.synology.me mx: @@ -88,12 +99,26 @@ jan-ole.tech: jan-ole.cloud: +jan-ole.party: + +jan-ole.photo: + ole.pink: a: "@": 185.239.239.162 "*": 185.239.239.162 narilah.live: +huebner.haus: + cname: + jan-ole: jan-ole.synology.me + "*.jan-ole": jan-ole.synology.me + +huebner.homes: + cname: + jan-ole: jan-ole.synology.me + "*.jan-ole": jan-ole.synology.me +#----- cedricpump.de: mx: "@/10": "zap356617-2.plesk08.zap-webspace.com" From 3681ddfed04f00443d90fc029bb3dbaf28b1fb3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Fri, 3 May 2024 02:56:34 +0200 Subject: [PATCH 05/36] feat: update zones (new influx server) --- zones.yaml | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/zones.yaml b/zones.yaml index 547bea5..528158c 100644 --- a/zones.yaml +++ b/zones.yaml @@ -6,10 +6,10 @@ jan-ole.de: "*.server0": 185.239.239.162 ganymede: 185.239.239.162 "*.ganymede": 185.239.239.162 - influx: 185.239.239.162 - "*.influx": 185.239.239.162 - portainer: 185.239.239.162 - "*.portainer": 185.239.239.162 + influx: 147.189.171.39 + "*.influx": 147.189.171.39 + portainer: 147.189.171.39 + "*.portainer": 147.189.171.39 #server1-------------- server1: 147.189.171.39 @@ -113,6 +113,8 @@ huebner.haus: cname: jan-ole: jan-ole.synology.me "*.jan-ole": jan-ole.synology.me + heiko: kgh7xxzoeeajftib.myfritz.net + "*.heiko": kgh7xxzoeeajftib.myfritz.net huebner.homes: cname: @@ -128,4 +130,29 @@ cedricpump.de: webmail: 185.239.237.65 txt: default_domainkey: "v=DKIM1; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqJZ/c83IQGBLOE0hFWM30cnlafqoJdf9a1qGvLPkhQEtFEYnpkeoVIwHRdgWjbkCg2HjYILTWdUSU81ZkvOdxI7OYJqp0sGPq96tZ6Lqve4hXZy6WVy7e1AKUYK9dRSiHSxfUdEd2X8V59Z6y34f4se0bzb4c3G1saLpic3xXliAQnOknmegfGjXPZuWelpoNUieWyCAtVOdVsUaKOQ/ApITGt9Sm/kRfwnSHweaiubxaUbCZUY+k4z4hK4mQLuJSulBBL5XCCYVo6AKI2wP9leVaC4MGXB11PalpxT6y/VrbM9uLzi0ayZsXnyhnxJhjVhoaXiubQF0HSkI3a6VRQIDAQAB;" - _domainkey: "o=-" \ No newline at end of file + _domainkey: "o=-" + +littleblondii.link: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + +littleblondii.live: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + +blondii.link: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + +blondii.live: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + +littleblondii.de: + a: + "@": 185.223.31.112 + www: 185.223.31.112 \ No newline at end of file From dde03c31299e3418176353580c64b0cbf4a31a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Sat, 11 May 2024 12:38:12 +0200 Subject: [PATCH 06/36] feat: update zones pre-deletion --- zones.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/zones.yaml b/zones.yaml index 528158c..d4e6c26 100644 --- a/zones.yaml +++ b/zones.yaml @@ -46,8 +46,6 @@ jan-ole.de: "*.hannah": jan-ole.synology.me photos: jan-ole.synology.me "*.photos": jan-ole.synology.me - paperless: hannah - "*.paperless": hannah streaming: jan-ole.synology.me "*.streaming": jan-ole.synology.me mx: From 6d89d5015d6ba769eb355c83a36412974a959e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Sat, 11 May 2024 12:40:29 +0200 Subject: [PATCH 07/36] feat: update zones website deletion --- zones.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/zones.yaml b/zones.yaml index d4e6c26..d3a5da2 100644 --- a/zones.yaml +++ b/zones.yaml @@ -4,8 +4,6 @@ jan-ole.de: #server0-------------- server0: 185.239.239.162 "*.server0": 185.239.239.162 - ganymede: 185.239.239.162 - "*.ganymede": 185.239.239.162 influx: 147.189.171.39 "*.influx": 147.189.171.39 portainer: 147.189.171.39 @@ -30,10 +28,6 @@ jan-ole.de: "*.usa.vpn": 181.214.240.124 #webspace0------------- - "@": 185.223.31.112 - www: 185.223.31.112 - "*.demo": 185.223.31.112 - demo: 185.223.31.112 #zap-gameserver palworld: 193.23.127.45 @@ -77,9 +71,6 @@ fairy-feet.de: "@": 147.189.171.39 jan-ole.link: - a: - "@": 185.223.31.112 - www: 185.223.31.112 ole.click: a: @@ -92,8 +83,6 @@ krewella.rocks: www: 185.223.31.112 jan-ole.tech: - txt: - "@": 70dcbb22ee584668a5cef68b058043c3 jan-ole.cloud: @@ -102,9 +91,7 @@ jan-ole.party: jan-ole.photo: ole.pink: - a: - "@": 185.239.239.162 - "*": 185.239.239.162 + narilah.live: huebner.haus: From 583b3e5b60583aeb4f7c5689b2c707ee20aa01bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Tue, 14 May 2024 15:11:07 +0200 Subject: [PATCH 08/36] feat: update zones add ciri.* --- zones.yaml | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/zones.yaml b/zones.yaml index d3a5da2..919cf34 100644 --- a/zones.yaml +++ b/zones.yaml @@ -4,16 +4,16 @@ jan-ole.de: #server0-------------- server0: 185.239.239.162 "*.server0": 185.239.239.162 - influx: 147.189.171.39 - "*.influx": 147.189.171.39 - portainer: 147.189.171.39 - "*.portainer": 147.189.171.39 #server1-------------- server1: 147.189.171.39 "*.server1": 147.189.171.39 music: 147.189.171.39 "*.music": 147.189.171.39 + influx: 147.189.171.39 + "*.influx": 147.189.171.39 + portainer: 147.189.171.39 + "*.portainer": 147.189.171.39 #server2-------------- server2: 134.255.232.17 @@ -28,6 +28,10 @@ jan-ole.de: "*.usa.vpn": 181.214.240.124 #webspace0------------- + "@": 185.223.31.112 + www: 185.223.31.112 + "*.demo": 185.223.31.112 + demo: 185.223.31.112 #zap-gameserver palworld: 193.23.127.45 @@ -71,6 +75,9 @@ fairy-feet.de: "@": 147.189.171.39 jan-ole.link: + a: + "@": 185.223.31.112 + www: 185.223.31.112 ole.click: a: @@ -138,6 +145,22 @@ blondii.live: www: 185.223.31.112 littleblondii.de: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + + +cirii.link: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + +cirii.live: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + +cirii.de: a: "@": 185.223.31.112 www: 185.223.31.112 \ No newline at end of file From cf513b706252dda4a5cd450e55fe05e72b28ed5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Mon, 20 May 2024 13:18:18 +0200 Subject: [PATCH 09/36] feat: update zones --- zones.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/zones.yaml b/zones.yaml index 919cf34..8af3336 100644 --- a/zones.yaml +++ b/zones.yaml @@ -4,6 +4,8 @@ jan-ole.de: #server0-------------- server0: 185.239.239.162 "*.server0": 185.239.239.162 + pve: 185.239.239.162 + "*.pve": 185.239.239.162 #server1-------------- server1: 147.189.171.39 @@ -89,18 +91,12 @@ krewella.rocks: "@": 185.223.31.112 www: 185.223.31.112 -jan-ole.tech: - jan-ole.cloud: jan-ole.party: -jan-ole.photo: - ole.pink: -narilah.live: - huebner.haus: cname: jan-ole: jan-ole.synology.me From 9127543c81fbcc393c9d39e8c32107bff07c0fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Sat, 25 May 2024 12:46:36 +0200 Subject: [PATCH 10/36] feat: update zones, add huebner.pink and .software --- zones.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/zones.yaml b/zones.yaml index 8af3336..4924dad 100644 --- a/zones.yaml +++ b/zones.yaml @@ -159,4 +159,16 @@ cirii.live: cirii.de: a: "@": 185.223.31.112 - www: 185.223.31.112 \ No newline at end of file + www: 185.223.31.112 + +huebner.software: + +huebner.pink: + cname: + sig1._domainkey: "sig1.dkim.huebner.pink.at.icloudmailadmin.com." + mx: + "@/10": "mx01.mail.icloud.com" + "@/20": "mx02.mail.icloud.com" + txt: + "@": "apple-domain=mOjnPLSTRwMrIocF" + "@/10": "v=spf1 include:icloud.com ~all" \ No newline at end of file From 628c47de986c66bf2418eaccedf0b864e718c75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Sat, 25 May 2024 13:56:27 +0200 Subject: [PATCH 11/36] feat: update zones for apple mail --- zones.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zones.yaml b/zones.yaml index 4924dad..0d46c07 100644 --- a/zones.yaml +++ b/zones.yaml @@ -52,7 +52,7 @@ jan-ole.de: "@/10": mx01.mail.icloud.com "@/20": mx02.mail.icloud.com txt: - "@": apple-domain=Q0mWxVlJtosPs2oy + "@": apple-domain=jCSU7oYX1R2qtWzG "@/10": v=spf1 redirect=icloud.com include:icloud.com ~all huebner.coffee: From 36c10033c6a56414204749a117bb3c5a0efa8cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Sat, 25 May 2024 14:07:32 +0200 Subject: [PATCH 12/36] feat: add OPENTOFU comment to iac-controlled records --- main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tf b/main.tf index aae8130..5cb95a0 100644 --- a/main.tf +++ b/main.tf @@ -37,4 +37,5 @@ for_each = { value = each.value.record_value ttl = 300 priority = each.value.record_type == "MX" ? tonumber(each.value.extra_data) : 0 + comment = "OpenTofu" } \ No newline at end of file From 4993db0b8f1a6ce9aca9b842c1767ce7dc48a3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Sat, 25 May 2024 14:31:19 +0200 Subject: [PATCH 13/36] feat: add google txt records --- zones.yaml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/zones.yaml b/zones.yaml index 0d46c07..a924d7b 100644 --- a/zones.yaml +++ b/zones.yaml @@ -54,6 +54,7 @@ jan-ole.de: txt: "@": apple-domain=jCSU7oYX1R2qtWzG "@/10": v=spf1 redirect=icloud.com include:icloud.com ~all + "@/20": google-site-verification=rzO53ch4FY1zxgms9_FJAyE0nnj9_uRmLaSKqXw38ww huebner.coffee: cname: @@ -80,6 +81,8 @@ jan-ole.link: a: "@": 185.223.31.112 www: 185.223.31.112 + txt: + "@": google-site-verification=HKmGUIFhbnE41t_358P10qZKhEufHzMAzlCSrv1iQW4 ole.click: a: @@ -93,8 +96,6 @@ krewella.rocks: jan-ole.cloud: -jan-ole.party: - ole.pink: huebner.haus: @@ -124,42 +125,57 @@ littleblondii.link: a: "@": 185.223.31.112 www: 185.223.31.112 + txt: + "@": google-site-verification=t7GFUeWz5_o8uNCiVC2neG9fykDyBNJpvrKOsm_rgJg littleblondii.live: a: "@": 185.223.31.112 www: 185.223.31.112 + txt: + "@": google-site-verification=o1EqL6Qo5RTrUz61EGh75YfhX0FkNCk848Hb5qDCes4 blondii.link: a: "@": 185.223.31.112 www: 185.223.31.112 + txt: + "@": google-site-verification=nCc2Fw7XciUq9-1eWAUPU1LhPaWx1gMeIKBaDDfy3Ks blondii.live: a: "@": 185.223.31.112 www: 185.223.31.112 + txt: + "@": google-site-verification=o1EqL6Qo5RTrUz61EGh75YfhX0FkNCk848Hb5qDCes4 littleblondii.de: a: "@": 185.223.31.112 www: 185.223.31.112 - + txt: + "@": google-site-verification=QDQCs2MeR73I0xPktUMmsqa9PuPkytpXYdCQEI-ekaM cirii.link: a: "@": 185.223.31.112 www: 185.223.31.112 + txt: + "@": google-site-verification=mz-r1UCGgDSf_SrblpLFRBmCUyzFuvbd_ROTsQF_8oA cirii.live: a: "@": 185.223.31.112 www: 185.223.31.112 + txt: + "@": google-site-verification=znOYwzJskM1sIZhpSikU7e1-QFCVWXlcPl3VVk5o68o cirii.de: a: "@": 185.223.31.112 www: 185.223.31.112 + txt: + "@": google-site-verification=RVjsHk1eDqRo0PCffqxguk3YRfFZtUdsUUgfEs_lzvo huebner.software: From 68d5b3e479f16e3dab714c9a949dfd1724fc6412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Sat, 25 May 2024 15:32:36 +0200 Subject: [PATCH 14/36] chore: cleanup --- main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tf b/main.tf index 5cb95a0..63b4bb1 100644 --- a/main.tf +++ b/main.tf @@ -27,6 +27,7 @@ data "cloudflare_zone" "zone" { for_each = local.zones name = each.key } + resource "cloudflare_record" "myrecord" { for_each = { for record in local.zone_data : "${record.record_type}${record.extra_data}-${record.record_name}.${record.zone_name}" => record } From d3b178a95c2f614e172ebdd7d043d56174b3be70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Sat, 25 May 2024 16:19:27 +0200 Subject: [PATCH 15/36] chore: remove steffie --- zones.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/zones.yaml b/zones.yaml index a924d7b..60c1ebb 100644 --- a/zones.yaml +++ b/zones.yaml @@ -109,17 +109,6 @@ huebner.homes: cname: jan-ole: jan-ole.synology.me "*.jan-ole": jan-ole.synology.me -#----- -cedricpump.de: - mx: - "@/10": "zap356617-2.plesk08.zap-webspace.com" - a: - "@": 185.239.237.65 - www: 185.239.237.65 - webmail: 185.239.237.65 - txt: - default_domainkey: "v=DKIM1; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqJZ/c83IQGBLOE0hFWM30cnlafqoJdf9a1qGvLPkhQEtFEYnpkeoVIwHRdgWjbkCg2HjYILTWdUSU81ZkvOdxI7OYJqp0sGPq96tZ6Lqve4hXZy6WVy7e1AKUYK9dRSiHSxfUdEd2X8V59Z6y34f4se0bzb4c3G1saLpic3xXliAQnOknmegfGjXPZuWelpoNUieWyCAtVOdVsUaKOQ/ApITGt9Sm/kRfwnSHweaiubxaUbCZUY+k4z4hK4mQLuJSulBBL5XCCYVo6AKI2wP9leVaC4MGXB11PalpxT6y/VrbM9uLzi0ayZsXnyhnxJhjVhoaXiubQF0HSkI3a6VRQIDAQAB;" - _domainkey: "o=-" littleblondii.link: a: From e9870649d4fea8e159bb9271a2ef3b82a713d569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Tue, 20 Aug 2024 12:59:01 +0200 Subject: [PATCH 16/36] feat: update zones.yaml --- zones.yaml | 50 +++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/zones.yaml b/zones.yaml index 60c1ebb..91a07cc 100644 --- a/zones.yaml +++ b/zones.yaml @@ -10,12 +10,6 @@ jan-ole.de: #server1-------------- server1: 147.189.171.39 "*.server1": 147.189.171.39 - music: 147.189.171.39 - "*.music": 147.189.171.39 - influx: 147.189.171.39 - "*.influx": 147.189.171.39 - portainer: 147.189.171.39 - "*.portainer": 147.189.171.39 #server2-------------- server2: 134.255.232.17 @@ -40,31 +34,27 @@ jan-ole.de: "*.palworld": 193.23.127.45 cname: + influx: jan-ole.synology.me + "*.influx": jan-ole.synology.me sig1_domainkey: sig1.dkim.jan-ole.de.at.icloudmailadmin.com - vercel: cname.vercel-dns.com hannah: jan-ole.synology.me "*.hannah": jan-ole.synology.me photos: jan-ole.synology.me "*.photos": jan-ole.synology.me streaming: jan-ole.synology.me "*.streaming": jan-ole.synology.me + lana: jan-ole.synology.me + "*.lana": jan-ole.synology.me mx: "@/10": mx01.mail.icloud.com "@/20": mx02.mail.icloud.com txt: - "@": apple-domain=jCSU7oYX1R2qtWzG + "@": apple-domain=OQLm26hZZUfPPxoQ "@/10": v=spf1 redirect=icloud.com include:icloud.com ~all "@/20": google-site-verification=rzO53ch4FY1zxgms9_FJAyE0nnj9_uRmLaSKqXw38ww + "_discord": dh=ddb43cee298d9a23196b21847105f88aafae8350 huebner.coffee: - cname: - sig1._domainkey: "sig1.dkim.huebner.coffee.at.icloudmailadmin.com." - mx: - "@/10": "mx01.mail.icloud.com" - "@/20": "mx02.mail.icloud.com" - txt: - "@": "apple-domain=3xAfDPSkrnPyp6Y4" - "@/10": "v=spf1 include:icloud.com ~all" jan-ole.download: a: @@ -73,9 +63,6 @@ jan-ole.download: "*": 185.239.237.65 fairy-feet.de: - a: - "*": 147.189.171.39 - "@": 147.189.171.39 jan-ole.link: a: @@ -88,15 +75,27 @@ ole.click: a: "@": 185.239.237.65 www: 185.239.237.65 - -krewella.rocks: - a: - "@": 185.223.31.112 - www: 185.223.31.112 + txt: + "_discord": dh=9f248b2dbca94cc3e47b672ad6a33415750fbc4e jan-ole.cloud: + a: + "*": 185.249.197.56 + "@": 185.249.197.56 + pve: 185.239.239.162 + pfsense: 185.249.197.56 + vm0: 193.34.69.94 + cname: + hannah: jan-ole.synology.me + "*.hannah": jan-ole.synology.me + lana: jan-ole.synology.me + "*.lana": jan-ole.synology.me + tube: jan-ole.synology.me + "*.tube": jan-ole.synology.me ole.pink: + txt: + "_discord": dh=8be51e2beb64f555b5170ee2da95fa5eba315250 huebner.haus: cname: @@ -106,9 +105,6 @@ huebner.haus: "*.heiko": kgh7xxzoeeajftib.myfritz.net huebner.homes: - cname: - jan-ole: jan-ole.synology.me - "*.jan-ole": jan-ole.synology.me littleblondii.link: a: From 529f65e2ac92f8caff5d29218a67ee68e6bf5b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Sat, 14 Sep 2024 14:13:56 +0200 Subject: [PATCH 17/36] feat: update zones.yaml --- zones.yaml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/zones.yaml b/zones.yaml index 91a07cc..99c1a1e 100644 --- a/zones.yaml +++ b/zones.yaml @@ -44,7 +44,8 @@ jan-ole.de: streaming: jan-ole.synology.me "*.streaming": jan-ole.synology.me lana: jan-ole.synology.me - "*.lana": jan-ole.synology.me + dockge: jan-ole.synology.me + git: jan-ole.synology.me mx: "@/10": mx01.mail.icloud.com "@/20": mx02.mail.icloud.com @@ -86,6 +87,8 @@ jan-ole.cloud: pfsense: 185.249.197.56 vm0: 193.34.69.94 cname: + "*.next": jan-ole.synology.me + next: jan-ole.synology.me hannah: jan-ole.synology.me "*.hannah": jan-ole.synology.me lana: jan-ole.synology.me @@ -162,6 +165,28 @@ cirii.de: txt: "@": google-site-verification=RVjsHk1eDqRo0PCffqxguk3YRfFZtUdsUUgfEs_lzvo +darkblondii.link: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + txt: + "@": google-site-verification=OtXtrYhaTsngZOMzfAwtgqUgnALh2sUfB8UoS53z0yo + +darkblondii.live: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + txt: + "@": google-site-verification=iwzEIcfA2YXNIPFEs7gjkPJbeS8uJeF9KZIwxDiJeks + +darkblondii.de: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + txt: + "@": google-site-verification=u9v4bvqD26WB5o8nO7zW9VMG5ZmjcNTSK_f6sAuNYSc + + huebner.software: huebner.pink: From 496292086f4720f6b1efa44688ab42338ba4060b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Tue, 24 Dec 2024 05:20:56 +0100 Subject: [PATCH 18/36] feat: update zones.yaml --- zones.yaml | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) mode change 100644 => 100755 zones.yaml diff --git a/zones.yaml b/zones.yaml old mode 100644 new mode 100755 index 99c1a1e..348917b --- a/zones.yaml +++ b/zones.yaml @@ -28,6 +28,8 @@ jan-ole.de: www: 185.223.31.112 "*.demo": 185.223.31.112 demo: 185.223.31.112 + "*.nuxt": 185.223.31.112 + nuxt: 185.223.31.112 #zap-gameserver palworld: 193.23.127.45 @@ -36,16 +38,13 @@ jan-ole.de: cname: influx: jan-ole.synology.me "*.influx": jan-ole.synology.me + books: jan-ole.synology.me sig1_domainkey: sig1.dkim.jan-ole.de.at.icloudmailadmin.com hannah: jan-ole.synology.me "*.hannah": jan-ole.synology.me - photos: jan-ole.synology.me - "*.photos": jan-ole.synology.me streaming: jan-ole.synology.me "*.streaming": jan-ole.synology.me lana: jan-ole.synology.me - dockge: jan-ole.synology.me - git: jan-ole.synology.me mx: "@/10": mx01.mail.icloud.com "@/20": mx02.mail.icloud.com @@ -55,8 +54,6 @@ jan-ole.de: "@/20": google-site-verification=rzO53ch4FY1zxgms9_FJAyE0nnj9_uRmLaSKqXw38ww "_discord": dh=ddb43cee298d9a23196b21847105f88aafae8350 -huebner.coffee: - jan-ole.download: a: "@": 185.239.237.65 @@ -180,12 +177,28 @@ darkblondii.live: "@": google-site-verification=iwzEIcfA2YXNIPFEs7gjkPJbeS8uJeF9KZIwxDiJeks darkblondii.de: + mx: + "@/10": darkblondii.de a: "@": 185.223.31.112 www: 185.223.31.112 + webmail: 185.223.31.112 txt: - "@": google-site-verification=u9v4bvqD26WB5o8nO7zW9VMG5ZmjcNTSK_f6sAuNYSc + "@": "v=spf1 a mx -all" + default._domainkey: "v=DKIM1; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr/e2vHLlv6CTwMoxHeyJxppb2d7z+voH7DeBOSQI/QM5qBT0yfLBJEg1/ayTrHIyzbXd0DOVfsk/Wv7i3fpPHnFfw9CYSIn8pQEL9+seUc/VP9FJ68+9akPkwUGinqE4nGkT7ByqDrUeZzErQMX1nqXxkwx0JpBZqFTxfNYi6IphbUSu4xatkFbGBFFOPiHxYyIZdp35uiHL8Ub+tpDJpQ7zLf5VVwlY9EeakzslV+UJhG/ANh6dkQwyXrdT0QQ0lC8RS1CF9qs060blqwk/QZvQG6WRON0aq6F/p+FZ4P7hFMoUiHVokdW1GIAXUpleTwXnXGZmJG4g2dM6HFv+fQIDAQAB;" + _domainkey: "o=-" + _DMARC: "v=DMARC1; p=quarantine; rua=mailto:huebner@jan-ole.de; ruf=mailto:huebner@jan-ole.de; fo=1" +rosadirk.live: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + webmail: 185.223.31.112 +rosadirk.de: + a: + "@": 185.223.31.112 + www: 185.223.31.112 + webmail: 185.223.31.112 huebner.software: @@ -197,4 +210,4 @@ huebner.pink: "@/20": "mx02.mail.icloud.com" txt: "@": "apple-domain=mOjnPLSTRwMrIocF" - "@/10": "v=spf1 include:icloud.com ~all" \ No newline at end of file + "@/10": "v=spf1 include:icloud.com ~all" From c2ec494411887390bd96587fde31d5939d8a56b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Sat, 1 Feb 2025 03:18:42 +0100 Subject: [PATCH 19/36] feat: move from cloudflare to hetzner update zones.yaml --- main.tf | 53 ++++++++++++++++++++++++--------- versions.tf | 14 +++++---- zones.yaml | 84 +++++++++++++++++++++++++++++++++++------------------ 3 files changed, 104 insertions(+), 47 deletions(-) diff --git a/main.tf b/main.tf index 63b4bb1..6af9272 100644 --- a/main.tf +++ b/main.tf @@ -1,9 +1,6 @@ -provider "cloudflare" { - api_token = local.cloudflare_api.auth.api_token -} locals { - cloudflare_api = yamldecode(file("${path.module}/auth.yaml")) + api = yamldecode(file("${path.module}/auth.yaml")) zones = yamldecode(file("${path.module}/zones.yaml")) zone_data = flatten([ @@ -22,21 +19,49 @@ locals { ]] ]) } - -data "cloudflare_zone" "zone" { - for_each = local.zones - name = each.key +output "zones" { + value = length(local.zones) } -resource "cloudflare_record" "myrecord" { +resource "hetznerdns_zone" "zone" { + for_each = local.zones + name = each.key + ttl = 300 +} + + + + + + +resource "hetznerdns_record" "myrecord" { for_each = { for record in local.zone_data : "${record.record_type}${record.extra_data}-${record.record_name}.${record.zone_name}" => record } - zone_id = data.cloudflare_zone.zone[each.value.zone_name].id - name = "${each.value.record_name}.${each.value.zone_name}" == "@.${each.value.zone_name}" ? each.value.zone_name : "${each.value.record_name}.${each.value.zone_name}" + zone_id = hetznerdns_zone.zone[each.value.zone_name].id + name = "${each.value.record_name}" type = each.value.record_type - value = each.value.record_value + value = each.value.record_type == "MX" ? "${each.value.extra_data} ${each.value.record_value}" : each.value.record_value ttl = 300 - priority = each.value.record_type == "MX" ? tonumber(each.value.extra_data) : 0 - comment = "OpenTofu" + +} + +resource "hetznerdns_record" "ns" { + for_each = { + for entry in flatten([ + for zone in hetznerdns_zone.zone : [ + for ns_entry in zone.ns : { + zone_id = zone.id + ns_entry = ns_entry + key = "${zone.id}-${ns_entry}" + } + ] + ]) : entry.key => entry + } + + zone_id = each.value.zone_id + name = "@" + type = "NS" + value = each.value.ns_entry + ttl = 300 } \ No newline at end of file diff --git a/versions.tf b/versions.tf index 1e2107a..ccd2067 100644 --- a/versions.tf +++ b/versions.tf @@ -1,9 +1,13 @@ terraform { required_providers { - cloudflare = { - source = "cloudflare/cloudflare" - version = "~> 4" - + hetznerdns = { + source = "germanbrew/hetznerdns" + version = "3.0.0" # Replace with latest version } } -} \ No newline at end of file +} + +provider "hetznerdns" { +api_token = local.api.auth.api_token +} + diff --git a/zones.yaml b/zones.yaml index 348917b..7cf4200 100755 --- a/zones.yaml +++ b/zones.yaml @@ -36,21 +36,19 @@ jan-ole.de: "*.palworld": 193.23.127.45 cname: - influx: jan-ole.synology.me - "*.influx": jan-ole.synology.me - books: jan-ole.synology.me + influx: lana.amq25ga7psako0gd.myfritz.net. + "*.influx": lana.amq25ga7psako0gd.myfritz.net. + books: lana.amq25ga7psako0gd.myfritz.net. sig1_domainkey: sig1.dkim.jan-ole.de.at.icloudmailadmin.com - hannah: jan-ole.synology.me - "*.hannah": jan-ole.synology.me - streaming: jan-ole.synology.me - "*.streaming": jan-ole.synology.me - lana: jan-ole.synology.me + streaming: lana.amq25ga7psako0gd.myfritz.net. + "*.streaming": lana.amq25ga7psako0gd.myfritz.net. + lana: lana.amq25ga7psako0gd.myfritz.net. mx: - "@/10": mx01.mail.icloud.com - "@/20": mx02.mail.icloud.com + "@/10": mx01.mail.icloud.com. + "@/20": mx02.mail.icloud.com. txt: "@": apple-domain=OQLm26hZZUfPPxoQ - "@/10": v=spf1 redirect=icloud.com include:icloud.com ~all + "@/10": "v=spf1 redirect=icloud.com include:icloud.com ~all" "@/20": google-site-verification=rzO53ch4FY1zxgms9_FJAyE0nnj9_uRmLaSKqXw38ww "_discord": dh=ddb43cee298d9a23196b21847105f88aafae8350 @@ -84,14 +82,18 @@ jan-ole.cloud: pfsense: 185.249.197.56 vm0: 193.34.69.94 cname: - "*.next": jan-ole.synology.me - next: jan-ole.synology.me - hannah: jan-ole.synology.me - "*.hannah": jan-ole.synology.me - lana: jan-ole.synology.me - "*.lana": jan-ole.synology.me - tube: jan-ole.synology.me - "*.tube": jan-ole.synology.me + "*.photos": lana.amq25ga7psako0gd.myfritz.net. + photos: lana.amq25ga7psako0gd.myfritz.net. + "*.next": lana.amq25ga7psako0gd.myfritz.net. + next: lana.amq25ga7psako0gd.myfritz.net. + ganymede: lana.amq25ga7psako0gd.myfritz.net. + "*.ganymede": lana.amq25ga7psako0gd.myfritz.net. + hannah: lana.amq25ga7psako0gd.myfritz.net. + "*.hannah": lana.amq25ga7psako0gd.myfritz.net. + lana: lana.amq25ga7psako0gd.myfritz.net. + "*.lana": lana.amq25ga7psako0gd.myfritz.net. + tube: lana.amq25ga7psako0gd.myfritz.net. + "*.tube": lana.amq25ga7psako0gd.myfritz.net. ole.pink: txt: @@ -99,10 +101,10 @@ ole.pink: huebner.haus: cname: - jan-ole: jan-ole.synology.me - "*.jan-ole": jan-ole.synology.me - heiko: kgh7xxzoeeajftib.myfritz.net - "*.heiko": kgh7xxzoeeajftib.myfritz.net + jan-ole: lana.amq25ga7psako0gd.myfritz.net. + "*.jan-ole": lana.amq25ga7psako0gd.myfritz.net. + heiko: kgh7xxzoeeajftib.myfritz.net. + "*.heiko": kgh7xxzoeeajftib.myfritz.net. huebner.homes: @@ -117,6 +119,7 @@ littleblondii.live: a: "@": 185.223.31.112 www: 185.223.31.112 + txt: "@": google-site-verification=o1EqL6Qo5RTrUz61EGh75YfhX0FkNCk848Hb5qDCes4 @@ -131,6 +134,8 @@ blondii.live: a: "@": 185.223.31.112 www: 185.223.31.112 + download: 185.223.31.112 + "*.download": 185.223.31.112 txt: "@": google-site-verification=o1EqL6Qo5RTrUz61EGh75YfhX0FkNCk848Hb5qDCes4 @@ -145,6 +150,7 @@ cirii.link: a: "@": 185.223.31.112 www: 185.223.31.112 + download: 185.223.31.112 txt: "@": google-site-verification=mz-r1UCGgDSf_SrblpLFRBmCUyzFuvbd_ROTsQF_8oA @@ -178,7 +184,7 @@ darkblondii.live: darkblondii.de: mx: - "@/10": darkblondii.de + "@/10": darkblondii.de. a: "@": 185.223.31.112 www: 185.223.31.112 @@ -187,7 +193,13 @@ darkblondii.de: "@": "v=spf1 a mx -all" default._domainkey: "v=DKIM1; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr/e2vHLlv6CTwMoxHeyJxppb2d7z+voH7DeBOSQI/QM5qBT0yfLBJEg1/ayTrHIyzbXd0DOVfsk/Wv7i3fpPHnFfw9CYSIn8pQEL9+seUc/VP9FJ68+9akPkwUGinqE4nGkT7ByqDrUeZzErQMX1nqXxkwx0JpBZqFTxfNYi6IphbUSu4xatkFbGBFFOPiHxYyIZdp35uiHL8Ub+tpDJpQ7zLf5VVwlY9EeakzslV+UJhG/ANh6dkQwyXrdT0QQ0lC8RS1CF9qs060blqwk/QZvQG6WRON0aq6F/p+FZ4P7hFMoUiHVokdW1GIAXUpleTwXnXGZmJG4g2dM6HFv+fQIDAQAB;" _domainkey: "o=-" - _DMARC: "v=DMARC1; p=quarantine; rua=mailto:huebner@jan-ole.de; ruf=mailto:huebner@jan-ole.de; fo=1" + _dmarc: "v=DMARC1; p=quarantine; rua=mailto:huebner@jan-ole.de; ruf=mailto:huebner@jan-ole.de; fo=1" + srv: + "_smtps._tcp": "0 0 465 darkblondii.de." + "_imaps._tcp": "0 0 993 darkblondii.de." + "_pop3s._tcp": "0 0 995 darkblondii.de." + "_autodiscover._tcp": "0 0 443 darkblondii.de." + "_autoconfig._tcp": "0 0 80 darkblondii.de." rosadirk.live: a: @@ -200,14 +212,30 @@ rosadirk.de: www: 185.223.31.112 webmail: 185.223.31.112 -huebner.software: +darkblondii.shop: + mx: + "@/10": darkblondii.shop. + a: + "@": 185.223.31.112 + www: 185.223.31.112 + webmail: 185.223.31.112 + +darkblondii.com: + mx: + "@/10": darkblondii.com. + a: + "@": 185.223.31.112 + www: 185.223.31.112 + webmail: 185.223.31.112 + +#huebner.software: huebner.pink: cname: sig1._domainkey: "sig1.dkim.huebner.pink.at.icloudmailadmin.com." mx: - "@/10": "mx01.mail.icloud.com" - "@/20": "mx02.mail.icloud.com" + "@/10": "mx01.mail.icloud.com." + "@/20": "mx02.mail.icloud.com." txt: "@": "apple-domain=mOjnPLSTRwMrIocF" "@/10": "v=spf1 include:icloud.com ~all" From 768da3383f91bcb0c86a18ca1616e3a4e984af7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Mon, 3 Feb 2025 10:37:33 +0100 Subject: [PATCH 20/36] feat: update zones --- apply.sh | 3 +++ zones.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100755 apply.sh diff --git a/apply.sh b/apply.sh new file mode 100755 index 0000000..7cab57f --- /dev/null +++ b/apply.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env zsh +tofu apply -target hetznerdns_zone.zone +tofu apply \ No newline at end of file diff --git a/zones.yaml b/zones.yaml index 7cf4200..f6e4451 100755 --- a/zones.yaml +++ b/zones.yaml @@ -228,7 +228,7 @@ darkblondii.com: www: 185.223.31.112 webmail: 185.223.31.112 -#huebner.software: +huebner.software: huebner.pink: cname: From 04f2c71c6da09576ca9c445d4ce735bb7da56060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Mon, 3 Feb 2025 10:41:24 +0100 Subject: [PATCH 21/36] chore: cleanup code --- main.tf | 9 +-------- outputs.tf | 3 +++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/main.tf b/main.tf index 6af9272..619ed02 100644 --- a/main.tf +++ b/main.tf @@ -19,9 +19,6 @@ locals { ]] ]) } -output "zones" { - value = length(local.zones) -} resource "hetznerdns_zone" "zone" { for_each = local.zones @@ -29,11 +26,6 @@ resource "hetznerdns_zone" "zone" { ttl = 300 } - - - - - resource "hetznerdns_record" "myrecord" { for_each = { for record in local.zone_data : "${record.record_type}${record.extra_data}-${record.record_name}.${record.zone_name}" => record } @@ -64,4 +56,5 @@ resource "hetznerdns_record" "ns" { type = "NS" value = each.value.ns_entry ttl = 300 + } \ No newline at end of file diff --git a/outputs.tf b/outputs.tf index e69de29..66655fa 100644 --- a/outputs.tf +++ b/outputs.tf @@ -0,0 +1,3 @@ +output "zones" { + value = length(local.zones) +} \ No newline at end of file From 1b03d83ff26234d26984d30bbfe7280cbea82f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Mon, 3 Feb 2025 10:42:25 +0100 Subject: [PATCH 22/36] chore: cleanup code --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 619ed02..541e8ed 100644 --- a/main.tf +++ b/main.tf @@ -1,7 +1,7 @@ locals { - api = yamldecode(file("${path.module}/auth.yaml")) - zones = yamldecode(file("${path.module}/zones.yaml")) + api = yamldecode(file("${path.module}/auth.yaml")) + zones = yamldecode(file("${path.module}/zones.yaml")) zone_data = flatten([ for zone_name, records in local.zones : [ From 2fb369309ebac27299df39afdff2cc165a0dbdd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Mon, 3 Feb 2025 10:48:16 +0100 Subject: [PATCH 23/36] chore: delete old files from cloudflare --- delete_records.sh | 22 ---------------------- inputs.tf | 0 variables.tf | 0 3 files changed, 22 deletions(-) delete mode 100644 delete_records.sh delete mode 100644 inputs.tf delete mode 100644 variables.tf diff --git a/delete_records.sh b/delete_records.sh deleted file mode 100644 index a3d5ad7..0000000 --- a/delete_records.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -TOKEN="" -ZONE_ID= - -# EMAIL=me@gmail.com -# KEY=11111111111111111111111111 -# Replace with -# -H "X-Auth-Email: ${EMAIL}" \ -# -H "X-Auth-Key: ${KEY}" \ -# for old API keys - - -curl -s -X GET https://api.cloudflare.com/client/v4/zones/${ZONE_ID}/dns_records?per_page=500 \ - -H "Authorization: Bearer ${TOKEN}" \ - -H "Content-Type: application/json" | jq .result[].id | tr -d '"' | ( - while read id; do - curl -s -X DELETE https://api.cloudflare.com/client/v4/zones/${ZONE_ID}/dns_records/${id} \ - -H "Authorization: Bearer ${TOKEN}" \ - -H "Content-Type: application/json" - done - ) diff --git a/inputs.tf b/inputs.tf deleted file mode 100644 index e69de29..0000000 diff --git a/variables.tf b/variables.tf deleted file mode 100644 index e69de29..0000000 From 99d8686a0285d77e578bcaf3260c579151da9943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Mon, 3 Feb 2025 10:50:31 +0100 Subject: [PATCH 24/36] chore: cleanup --- main.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.tf b/main.tf index 541e8ed..a299d2b 100644 --- a/main.tf +++ b/main.tf @@ -31,10 +31,10 @@ for_each = { for record in local.zone_data : "${record.record_type}${record.extra_data}-${record.record_name}.${record.zone_name}" => record } zone_id = hetznerdns_zone.zone[each.value.zone_name].id - name = "${each.value.record_name}" - type = each.value.record_type - value = each.value.record_type == "MX" ? "${each.value.extra_data} ${each.value.record_value}" : each.value.record_value - ttl = 300 + name = "${each.value.record_name}" + type = each.value.record_type + value = each.value.record_type == "MX" ? "${each.value.extra_data} ${each.value.record_value}" : each.value.record_value + ttl = 300 } From 19b026da8339763a41d2c9320af9207d26cb7680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Mon, 3 Feb 2025 10:52:43 +0100 Subject: [PATCH 25/36] chore: cleanup --- main.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main.tf b/main.tf index a299d2b..b428725 100644 --- a/main.tf +++ b/main.tf @@ -21,9 +21,9 @@ locals { } resource "hetznerdns_zone" "zone" { - for_each = local.zones - name = each.key - ttl = 300 + for_each = local.zones + name = each.key + ttl = 300 } resource "hetznerdns_record" "myrecord" { @@ -31,9 +31,9 @@ for_each = { for record in local.zone_data : "${record.record_type}${record.extra_data}-${record.record_name}.${record.zone_name}" => record } zone_id = hetznerdns_zone.zone[each.value.zone_name].id - name = "${each.value.record_name}" - type = each.value.record_type - value = each.value.record_type == "MX" ? "${each.value.extra_data} ${each.value.record_value}" : each.value.record_value + name = "${each.value.record_name}" + type = each.value.record_type + value = each.value.record_type == "MX" ? "${each.value.extra_data} ${each.value.record_value}" : each.value.record_value ttl = 300 } From e38d50c5041f562d6f8de4ea2230ff8a19d9880c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Wed, 5 Feb 2025 20:11:29 +0100 Subject: [PATCH 26/36] chore: update version --- versions.tf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/versions.tf b/versions.tf index ccd2067..f483e09 100644 --- a/versions.tf +++ b/versions.tf @@ -2,12 +2,11 @@ terraform { required_providers { hetznerdns = { source = "germanbrew/hetznerdns" - version = "3.0.0" # Replace with latest version + version = "3.3.3" } } } provider "hetznerdns" { -api_token = local.api.auth.api_token -} - + api_token = local.api.auth.api_token +} \ No newline at end of file From 5f6a9b801a90514d7fc6cc4d17271409758f831c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Wed, 5 Feb 2025 20:30:35 +0100 Subject: [PATCH 27/36] feat: add apply script that handles new zones --- apply.sh | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/apply.sh b/apply.sh index 7cab57f..c6c40bc 100755 --- a/apply.sh +++ b/apply.sh @@ -1,3 +1,41 @@ #!/usr/bin/env zsh -tofu apply -target hetznerdns_zone.zone -tofu apply \ No newline at end of file + +set -e +set -o pipefail +set -u + +echo "🔍 Running Tofu plan..." +if ! tofu plan -out=tfplan 2>&1 | tee plan.log; then + echo "❌ Plan failed. Checking for missing zones..." + + # Check if the error is related to a missing DNS zone + if grep -q "\-target planning" plan.log; then + echo "⚠️ Missing DNS zones detected. Creating them first..." + + # Apply only the zone creation step + tofu apply -target=hetznerdns_zone.zone + + echo "🔄 Re-running full plan after zone creation..." + if ! tofu plan -out=tfplan 2>&1 | tee plan.log; then + echo "❌ Plan failed even after zone creation. Exiting." + exit 1 + fi + else + echo "❌ Plan failed due to an unknown issue. Exiting." + exit 1 + fi +fi + +#applying a planfile skips confirmations... +echo "✅ Plan successful. Ready to apply changes." +echo "Do you want to apply these changes? (y/n)" +read -r apply_confirmation + +if [[ "$apply_confirmation" =~ ^[Yy]$ ]]; then + echo "🔄 Applying changes..." + tofu apply tfplan + echo "🎉 Apply complete!" +else + echo "❌ Apply aborted by user." + exit 1 +fi \ No newline at end of file From 3fe945f4d2e9f965f9573ef9e43b7af5aad73bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Wed, 5 Feb 2025 20:44:57 +0100 Subject: [PATCH 28/36] chore: update gitignore and handle no changes in apply script --- .gitignore | 2 ++ apply.sh | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 0c49583..1dcf0a3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ venv/ .terraform.lock.hcl .terraform auth.yaml +tfplan +plan.log diff --git a/apply.sh b/apply.sh index c6c40bc..876cae8 100755 --- a/apply.sh +++ b/apply.sh @@ -26,6 +26,12 @@ if ! tofu plan -out=tfplan 2>&1 | tee plan.log; then fi fi +# Check if no changes are required +if grep -q "No changes" plan.log; then + echo "✅ No changes detected. Exiting." + exit 0 +fi + #applying a planfile skips confirmations... echo "✅ Plan successful. Ready to apply changes." echo "Do you want to apply these changes? (y/n)" From 3f960fe68f9ab7484fbbeee8a24090b5f574fb9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Wed, 5 Feb 2025 21:58:39 +0100 Subject: [PATCH 29/36] feat: fixed zone creation --- apply.sh | 47 ----------------------------------------------- main.tf | 43 +++++++++++++++++++++++++++++-------------- zones.yaml | 2 -- 3 files changed, 29 insertions(+), 63 deletions(-) delete mode 100755 apply.sh diff --git a/apply.sh b/apply.sh deleted file mode 100755 index 876cae8..0000000 --- a/apply.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env zsh - -set -e -set -o pipefail -set -u - -echo "🔍 Running Tofu plan..." -if ! tofu plan -out=tfplan 2>&1 | tee plan.log; then - echo "❌ Plan failed. Checking for missing zones..." - - # Check if the error is related to a missing DNS zone - if grep -q "\-target planning" plan.log; then - echo "⚠️ Missing DNS zones detected. Creating them first..." - - # Apply only the zone creation step - tofu apply -target=hetznerdns_zone.zone - - echo "🔄 Re-running full plan after zone creation..." - if ! tofu plan -out=tfplan 2>&1 | tee plan.log; then - echo "❌ Plan failed even after zone creation. Exiting." - exit 1 - fi - else - echo "❌ Plan failed due to an unknown issue. Exiting." - exit 1 - fi -fi - -# Check if no changes are required -if grep -q "No changes" plan.log; then - echo "✅ No changes detected. Exiting." - exit 0 -fi - -#applying a planfile skips confirmations... -echo "✅ Plan successful. Ready to apply changes." -echo "Do you want to apply these changes? (y/n)" -read -r apply_confirmation - -if [[ "$apply_confirmation" =~ ^[Yy]$ ]]; then - echo "🔄 Applying changes..." - tofu apply tfplan - echo "🎉 Apply complete!" -else - echo "❌ Apply aborted by user." - exit 1 -fi \ No newline at end of file diff --git a/main.tf b/main.tf index b428725..9dad4b4 100644 --- a/main.tf +++ b/main.tf @@ -1,7 +1,25 @@ + locals { api = yamldecode(file("${path.module}/auth.yaml")) zones = yamldecode(file("${path.module}/zones.yaml")) + nameservers = data.hetznerdns_nameservers.primary.ns + + + + + + ns_data = flatten([ + for zone_name, records in local.zones : [ + for ns_entry in local.nameservers : { + zone_name = zone_name + record_type = "NS" + record_value = ns_entry.name + record_name = "@" + extra_data = "" + } + ] + ]) zone_data = flatten([ for zone_name, records in local.zones : [ @@ -20,6 +38,10 @@ locals { ]) } +data "hetznerdns_nameservers" "primary" { + type = "authoritative" +} + resource "hetznerdns_zone" "zone" { for_each = local.zones name = each.key @@ -38,23 +60,16 @@ for_each = { } + resource "hetznerdns_record" "ns" { for_each = { - for entry in flatten([ - for zone in hetznerdns_zone.zone : [ - for ns_entry in zone.ns : { - zone_id = zone.id - ns_entry = ns_entry - key = "${zone.id}-${ns_entry}" - } - ] - ]) : entry.key => entry + for record in local.ns_data : + "${record.record_type}-${record.record_name}-${record.zone_name}-${record.record_value}" => record } - zone_id = each.value.zone_id - name = "@" - type = "NS" - value = each.value.ns_entry + zone_id = hetznerdns_zone.zone[each.value.zone_name].id + name = each.value.record_name + type = each.value.record_type + value = each.value.record_value ttl = 300 - } \ No newline at end of file diff --git a/zones.yaml b/zones.yaml index f6e4451..9d3c8a1 100755 --- a/zones.yaml +++ b/zones.yaml @@ -4,8 +4,6 @@ jan-ole.de: #server0-------------- server0: 185.239.239.162 "*.server0": 185.239.239.162 - pve: 185.239.239.162 - "*.pve": 185.239.239.162 #server1-------------- server1: 147.189.171.39 From d0bae0c6296f7cfd94e06d8e4b94761a73fd8dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Wed, 5 Feb 2025 22:02:54 +0100 Subject: [PATCH 30/36] chore: update auth sample for new provider --- auth_sample.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/auth_sample.yaml b/auth_sample.yaml index 0f62506..247d673 100644 --- a/auth_sample.yaml +++ b/auth_sample.yaml @@ -1,3 +1,2 @@ auth: - api_token: !add - email: !add \ No newline at end of file + api_token: !add \ No newline at end of file From a9d32d6c5e0815417151a83398067c8171120772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Thu, 13 Mar 2025 17:36:54 +0100 Subject: [PATCH 31/36] feat: update zones --- zones.yaml | 110 ++++++++++++----------------------------------------- 1 file changed, 25 insertions(+), 85 deletions(-) diff --git a/zones.yaml b/zones.yaml index 9d3c8a1..3f768d4 100755 --- a/zones.yaml +++ b/zones.yaml @@ -37,7 +37,7 @@ jan-ole.de: influx: lana.amq25ga7psako0gd.myfritz.net. "*.influx": lana.amq25ga7psako0gd.myfritz.net. books: lana.amq25ga7psako0gd.myfritz.net. - sig1_domainkey: sig1.dkim.jan-ole.de.at.icloudmailadmin.com + sig1._domainkey: sig1.dkim.jan-ole.de.at.icloudmailadmin.com. streaming: lana.amq25ga7psako0gd.myfritz.net. "*.streaming": lana.amq25ga7psako0gd.myfritz.net. lana: lana.amq25ga7psako0gd.myfritz.net. @@ -45,7 +45,7 @@ jan-ole.de: "@/10": mx01.mail.icloud.com. "@/20": mx02.mail.icloud.com. txt: - "@": apple-domain=OQLm26hZZUfPPxoQ + "@": apple-domain=QREjDJD5KtZRhlq8 "@/10": "v=spf1 redirect=icloud.com include:icloud.com ~all" "@/20": google-site-verification=rzO53ch4FY1zxgms9_FJAyE0nnj9_uRmLaSKqXw38ww "_discord": dh=ddb43cee298d9a23196b21847105f88aafae8350 @@ -59,9 +59,12 @@ jan-ole.download: fairy-feet.de: jan-ole.link: + mx: + "@/10": jan-ole.link. a: "@": 185.223.31.112 www: 185.223.31.112 + webmail: 185.223.31.112 txt: "@": google-site-verification=HKmGUIFhbnE41t_358P10qZKhEufHzMAzlCSrv1iQW4 @@ -104,79 +107,34 @@ huebner.haus: heiko: kgh7xxzoeeajftib.myfritz.net. "*.heiko": kgh7xxzoeeajftib.myfritz.net. -huebner.homes: - -littleblondii.link: - a: - "@": 185.223.31.112 - www: 185.223.31.112 - txt: - "@": google-site-verification=t7GFUeWz5_o8uNCiVC2neG9fykDyBNJpvrKOsm_rgJg - -littleblondii.live: - a: - "@": 185.223.31.112 - www: 185.223.31.112 - - txt: - "@": google-site-verification=o1EqL6Qo5RTrUz61EGh75YfhX0FkNCk848Hb5qDCes4 blondii.link: a: - "@": 185.223.31.112 - www: 185.223.31.112 + "@": 134.255.232.17 + www: 134.255.232.17 txt: "@": google-site-verification=nCc2Fw7XciUq9-1eWAUPU1LhPaWx1gMeIKBaDDfy3Ks blondii.live: a: - "@": 185.223.31.112 - www: 185.223.31.112 - download: 185.223.31.112 - "*.download": 185.223.31.112 + "@": 134.255.232.17 + www: 134.255.232.17 + download: 134.255.232.17 + "*.download": 134.255.232.17 txt: "@": google-site-verification=o1EqL6Qo5RTrUz61EGh75YfhX0FkNCk848Hb5qDCes4 -littleblondii.de: - a: - "@": 185.223.31.112 - www: 185.223.31.112 - txt: - "@": google-site-verification=QDQCs2MeR73I0xPktUMmsqa9PuPkytpXYdCQEI-ekaM - -cirii.link: - a: - "@": 185.223.31.112 - www: 185.223.31.112 - download: 185.223.31.112 - txt: - "@": google-site-verification=mz-r1UCGgDSf_SrblpLFRBmCUyzFuvbd_ROTsQF_8oA - -cirii.live: - a: - "@": 185.223.31.112 - www: 185.223.31.112 - txt: - "@": google-site-verification=znOYwzJskM1sIZhpSikU7e1-QFCVWXlcPl3VVk5o68o - -cirii.de: - a: - "@": 185.223.31.112 - www: 185.223.31.112 - txt: - "@": google-site-verification=RVjsHk1eDqRo0PCffqxguk3YRfFZtUdsUUgfEs_lzvo - darkblondii.link: a: - "@": 185.223.31.112 - www: 185.223.31.112 + "@": 134.255.232.17 + www: 134.255.232.17 txt: "@": google-site-verification=OtXtrYhaTsngZOMzfAwtgqUgnALh2sUfB8UoS53z0yo darkblondii.live: a: - "@": 185.223.31.112 - www: 185.223.31.112 + "@": 134.255.232.17 + www: 134.255.232.17 txt: "@": google-site-verification=iwzEIcfA2YXNIPFEs7gjkPJbeS8uJeF9KZIwxDiJeks @@ -184,49 +142,31 @@ darkblondii.de: mx: "@/10": darkblondii.de. a: - "@": 185.223.31.112 - www: 185.223.31.112 - webmail: 185.223.31.112 + "@": 134.255.232.17 + www: 134.255.232.17 + webmail: 134.255.232.17 txt: + "@/10": "google-site-verification=u9v4bvqD26WB5o8nO7zW9VMG5ZmjcNTSK_f6sAuNYSc" "@": "v=spf1 a mx -all" - default._domainkey: "v=DKIM1; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr/e2vHLlv6CTwMoxHeyJxppb2d7z+voH7DeBOSQI/QM5qBT0yfLBJEg1/ayTrHIyzbXd0DOVfsk/Wv7i3fpPHnFfw9CYSIn8pQEL9+seUc/VP9FJ68+9akPkwUGinqE4nGkT7ByqDrUeZzErQMX1nqXxkwx0JpBZqFTxfNYi6IphbUSu4xatkFbGBFFOPiHxYyIZdp35uiHL8Ub+tpDJpQ7zLf5VVwlY9EeakzslV+UJhG/ANh6dkQwyXrdT0QQ0lC8RS1CF9qs060blqwk/QZvQG6WRON0aq6F/p+FZ4P7hFMoUiHVokdW1GIAXUpleTwXnXGZmJG4g2dM6HFv+fQIDAQAB;" + default._domainkey: "v=DKIM1;k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0kl6jrx7/DiYktLY9mEEnVLpMA8TWgCuNBzNn0Io2tdb8+/FbWqB5P+Ps+3iGpm+A0WzFCHgBTyA16KtRUJ4uTs8BZdF/oM6jzEKJhJKaPsy27y8+/1tg2Dlko3vRHcIjLmebCQigMZtf4r9Ue6PhSlSB/0CyUdbqyXX+YqQjPwIDAQAB" _domainkey: "o=-" _dmarc: "v=DMARC1; p=quarantine; rua=mailto:huebner@jan-ole.de; ruf=mailto:huebner@jan-ole.de; fo=1" - srv: - "_smtps._tcp": "0 0 465 darkblondii.de." - "_imaps._tcp": "0 0 993 darkblondii.de." - "_pop3s._tcp": "0 0 995 darkblondii.de." - "_autodiscover._tcp": "0 0 443 darkblondii.de." - "_autoconfig._tcp": "0 0 80 darkblondii.de." - -rosadirk.live: - a: - "@": 185.223.31.112 - www: 185.223.31.112 - webmail: 185.223.31.112 -rosadirk.de: - a: - "@": 185.223.31.112 - www: 185.223.31.112 - webmail: 185.223.31.112 darkblondii.shop: mx: "@/10": darkblondii.shop. a: - "@": 185.223.31.112 - www: 185.223.31.112 - webmail: 185.223.31.112 + "@": 134.255.232.17 + www: 134.255.232.17 + webmail: 134.255.232.17 darkblondii.com: mx: "@/10": darkblondii.com. a: - "@": 185.223.31.112 - www: 185.223.31.112 - webmail: 185.223.31.112 + "@": 134.255.232.17 + www: 134.255.232.17 -huebner.software: huebner.pink: cname: From 097672f82708dc0bd8bcc16d1cca8dc105588de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Thu, 3 Apr 2025 20:11:08 +0200 Subject: [PATCH 32/36] feat: add output for zone ids --- outputs.tf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/outputs.tf b/outputs.tf index 66655fa..ecbae45 100644 --- a/outputs.tf +++ b/outputs.tf @@ -1,3 +1,6 @@ output "zones" { value = length(local.zones) -} \ No newline at end of file +} +output "zone_ids" { + value = { for name, zone in hetznerdns_zone.zone : name => zone.id } +} From 134a0682b8041cbb884b096fe05549570067e86f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Thu, 3 Apr 2025 20:11:51 +0200 Subject: [PATCH 33/36] feat: update zones --- zones.yaml | 62 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/zones.yaml b/zones.yaml index 3f768d4..7f38aac 100755 --- a/zones.yaml +++ b/zones.yaml @@ -10,8 +10,8 @@ jan-ole.de: "*.server1": 147.189.171.39 #server2-------------- - server2: 134.255.232.17 - "*.server2": 134.255.232.17 + server2: 185.223.31.112 + "*.server2": 185.223.31.112 #server3-------------- server3: 45.141.36.103 @@ -36,7 +36,7 @@ jan-ole.de: cname: influx: lana.amq25ga7psako0gd.myfritz.net. "*.influx": lana.amq25ga7psako0gd.myfritz.net. - books: lana.amq25ga7psako0gd.myfritz.net. + books: ole.pink. sig1._domainkey: sig1.dkim.jan-ole.de.at.icloudmailadmin.com. streaming: lana.amq25ga7psako0gd.myfritz.net. "*.streaming": lana.amq25ga7psako0gd.myfritz.net. @@ -56,6 +56,24 @@ jan-ole.download: www: 185.239.237.65 "*": 185.239.237.65 +jan-ole.sh: + a: + "@": 185.239.237.65 + www: 185.239.237.65 + "*": 185.239.237.65 + +jan-ole.dev: + a: + "@": 185.239.237.65 + www: 185.239.237.65 + "*": 185.239.237.65 + +ole.monster: + a: + "@": 185.239.237.65 + www: 185.239.237.65 + "*": 185.239.237.65 + fairy-feet.de: jan-ole.link: @@ -110,31 +128,31 @@ huebner.haus: blondii.link: a: - "@": 134.255.232.17 - www: 134.255.232.17 + "@": 185.223.31.112 + www: 185.223.31.112 txt: "@": google-site-verification=nCc2Fw7XciUq9-1eWAUPU1LhPaWx1gMeIKBaDDfy3Ks blondii.live: a: - "@": 134.255.232.17 - www: 134.255.232.17 - download: 134.255.232.17 - "*.download": 134.255.232.17 + "@": 185.223.31.112 + www: 185.223.31.112 + download: 185.223.31.112 + "*.download": 185.223.31.112 txt: "@": google-site-verification=o1EqL6Qo5RTrUz61EGh75YfhX0FkNCk848Hb5qDCes4 darkblondii.link: a: - "@": 134.255.232.17 - www: 134.255.232.17 + "@": 185.223.31.112 + www: 185.223.31.112 txt: "@": google-site-verification=OtXtrYhaTsngZOMzfAwtgqUgnALh2sUfB8UoS53z0yo darkblondii.live: a: - "@": 134.255.232.17 - www: 134.255.232.17 + "@": 185.223.31.112 + www: 185.223.31.112 txt: "@": google-site-verification=iwzEIcfA2YXNIPFEs7gjkPJbeS8uJeF9KZIwxDiJeks @@ -142,13 +160,13 @@ darkblondii.de: mx: "@/10": darkblondii.de. a: - "@": 134.255.232.17 - www: 134.255.232.17 - webmail: 134.255.232.17 + "@": 185.223.31.112 + www: 185.223.31.112 + webmail: 185.223.31.112 txt: "@/10": "google-site-verification=u9v4bvqD26WB5o8nO7zW9VMG5ZmjcNTSK_f6sAuNYSc" "@": "v=spf1 a mx -all" - default._domainkey: "v=DKIM1;k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0kl6jrx7/DiYktLY9mEEnVLpMA8TWgCuNBzNn0Io2tdb8+/FbWqB5P+Ps+3iGpm+A0WzFCHgBTyA16KtRUJ4uTs8BZdF/oM6jzEKJhJKaPsy27y8+/1tg2Dlko3vRHcIjLmebCQigMZtf4r9Ue6PhSlSB/0CyUdbqyXX+YqQjPwIDAQAB" + default._domainkey: "v=DKIM1; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr/e2vHLlv6CTwMoxHeyJxppb2d7z+voH7DeBOSQI/QM5qBT0yfLBJEg1/ayTrHIyzbXd0DOVfsk/Wv7i3fpPHnFfw9CYSIn8pQEL9+seUc/VP9FJ68+9akPkwUGinqE4nGkT7ByqDrUeZzErQMX1nqXxkwx0JpBZqFTxfNYi6IphbUSu4xatkFbGBFFOPiHxYyIZdp35uiHL8Ub+tpDJpQ7zLf5VVwlY9EeakzslV+UJhG/ANh6dkQwyXrdT0QQ0lC8RS1CF9qs060blqwk/QZvQG6WRON0aq6F/p+FZ4P7hFMoUiHVokdW1GIAXUpleTwXnXGZmJG4g2dM6HFv+fQIDAQAB;" _domainkey: "o=-" _dmarc: "v=DMARC1; p=quarantine; rua=mailto:huebner@jan-ole.de; ruf=mailto:huebner@jan-ole.de; fo=1" @@ -156,16 +174,16 @@ darkblondii.shop: mx: "@/10": darkblondii.shop. a: - "@": 134.255.232.17 - www: 134.255.232.17 - webmail: 134.255.232.17 + "@": 185.223.31.112 + www: 185.223.31.112 + webmail: 185.223.31.112 darkblondii.com: mx: "@/10": darkblondii.com. a: - "@": 134.255.232.17 - www: 134.255.232.17 + "@": 185.223.31.112 + www: 185.223.31.112 huebner.pink: From 5856a2beca73cc83460a4be4d89ef2792377c83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20Hu=CC=88bner?= Date: Thu, 3 Apr 2025 20:54:48 +0200 Subject: [PATCH 34/36] fix(server2): wrong ip --- zones.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zones.yaml b/zones.yaml index 7f38aac..7387048 100755 --- a/zones.yaml +++ b/zones.yaml @@ -10,8 +10,8 @@ jan-ole.de: "*.server1": 147.189.171.39 #server2-------------- - server2: 185.223.31.112 - "*.server2": 185.223.31.112 + server2: 134.255.232.17 + "*.server2": 134.255.232.17 #server3-------------- server3: 45.141.36.103 From d66c0cbc69794ae688cfd4ff8eeb4f33cabffa6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Tue, 13 May 2025 11:36:16 +0200 Subject: [PATCH 35/36] feat(ddns): remove myfritz from zones --- zones.yaml | 69 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/zones.yaml b/zones.yaml index 7387048..75e88ff 100755 --- a/zones.yaml +++ b/zones.yaml @@ -22,25 +22,16 @@ jan-ole.de: "*.usa.vpn": 181.214.240.124 #webspace0------------- - "@": 185.223.31.112 www: 185.223.31.112 + "@": 185.223.31.112 "*.demo": 185.223.31.112 demo: 185.223.31.112 - "*.nuxt": 185.223.31.112 - nuxt: 185.223.31.112 - - #zap-gameserver - palworld: 193.23.127.45 - "*.palworld": 193.23.127.45 cname: - influx: lana.amq25ga7psako0gd.myfritz.net. - "*.influx": lana.amq25ga7psako0gd.myfritz.net. - books: ole.pink. sig1._domainkey: sig1.dkim.jan-ole.de.at.icloudmailadmin.com. - streaming: lana.amq25ga7psako0gd.myfritz.net. - "*.streaming": lana.amq25ga7psako0gd.myfritz.net. - lana: lana.amq25ga7psako0gd.myfritz.net. + streaming: jan-ole.cloud. + "*.streaming": jan-ole.cloud. + lana: jan-ole.cloud. mx: "@/10": mx01.mail.icloud.com. "@/20": mx02.mail.icloud.com. @@ -57,10 +48,18 @@ jan-ole.download: "*": 185.239.237.65 jan-ole.sh: + cname: + "www": janolehuebner.github.io. a: - "@": 185.239.237.65 - www: 185.239.237.65 - "*": 185.239.237.65 + "@/10": 185.199.108.153 + "@/20": 185.199.109.153 + "@/30": 185.199.110.153 + "@/40": 185.199.111.153 + aaaa: + "@/10": 2606:50c0:8000::153 + "@/20": 2606:50c0:8001::153 + "@/30": 2606:50c0:8002::153 + "@/40": 2606:50c0:8003::153 jan-ole.dev: a: @@ -95,24 +94,24 @@ ole.click: jan-ole.cloud: a: - "*": 185.249.197.56 - "@": 185.249.197.56 - pve: 185.239.239.162 - pfsense: 185.249.197.56 - vm0: 193.34.69.94 + #zap-gameserver + palworld: 193.23.127.45 + "*.palworld": 193.23.127.45 cname: - "*.photos": lana.amq25ga7psako0gd.myfritz.net. - photos: lana.amq25ga7psako0gd.myfritz.net. - "*.next": lana.amq25ga7psako0gd.myfritz.net. - next: lana.amq25ga7psako0gd.myfritz.net. - ganymede: lana.amq25ga7psako0gd.myfritz.net. - "*.ganymede": lana.amq25ga7psako0gd.myfritz.net. - hannah: lana.amq25ga7psako0gd.myfritz.net. - "*.hannah": lana.amq25ga7psako0gd.myfritz.net. - lana: lana.amq25ga7psako0gd.myfritz.net. - "*.lana": lana.amq25ga7psako0gd.myfritz.net. - tube: lana.amq25ga7psako0gd.myfritz.net. - "*.tube": lana.amq25ga7psako0gd.myfritz.net. + influx: jan-ole.cloud. + "*.influx": jan-ole.cloud. + books: jan-ole.cloud. + dav: jan-ole.cloud. + "*.photos": jan-ole.cloud. + photos: jan-ole.cloud. + ganymede: jan-ole.cloud. + "*.ganymede": jan-ole.cloud. + lana: jan-ole.cloud. + "*.lana": jan-ole.cloud. + tube: jan-ole.cloud. + "*.tube": jan-ole.cloud. + streaming: jan-ole.cloud. + "*.streaming": jan-ole.cloud. ole.pink: txt: @@ -120,8 +119,8 @@ ole.pink: huebner.haus: cname: - jan-ole: lana.amq25ga7psako0gd.myfritz.net. - "*.jan-ole": lana.amq25ga7psako0gd.myfritz.net. + jan-ole: jan-ole.cloud. + "*.jan-ole": jan-ole.cloud. heiko: kgh7xxzoeeajftib.myfritz.net. "*.heiko": kgh7xxzoeeajftib.myfritz.net. From 8cf1b3fe337b1680c15521ab485a482d458f645c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Ole=20H=C3=BCbner?= Date: Sat, 24 May 2025 00:26:47 +0200 Subject: [PATCH 36/36] feat: update zones --- .gitignore | 2 ++ zones.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 1dcf0a3..aefe81d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ venv/ auth.yaml tfplan plan.log +.DS_Store +.DS_Store diff --git a/zones.yaml b/zones.yaml index 75e88ff..68ca51b 100755 --- a/zones.yaml +++ b/zones.yaml @@ -112,6 +112,8 @@ jan-ole.cloud: "*.tube": jan-ole.cloud. streaming: jan-ole.cloud. "*.streaming": jan-ole.cloud. + git: jan-ole.cloud. + "*.git": janole.cloud. ole.pink: txt: