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 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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 10/10] 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: