From 507088cac419b33e58b83a0b69e0cc93bf3d222e Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Sat, 2 Sep 2023 19:11:16 +0200 Subject: Correct 1984 IP address for AXFR transfers --- container.scm | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/container.scm b/container.scm index 8752b9d..9f51721 100644 --- a/container.scm +++ b/container.scm @@ -610,15 +610,15 @@ exim_path = /run/setuid-programs/exim "/etc/dovecot/users"))))) (mail-location "maildir:~/Maildir")))) -(define %1984-freedns-nameservers - '(("ns0.1984.is" "45.76.37.222") - ("ns1.1984.is" "194.58.192.36") - ("ns2.1984.is" "45.32.180.186" "93.95.226.52") - ("ns1.1984hosting.com" "185.42.137.114") - ("ns2.1984hosting.com" "93.95.226.53"))) - (define (make-zone-entries domain) - (define-zone-entries entries-sans-ns + (define-zone-entries entries + ;; nameservers + ("@" "" "IN" "NS" "vps-93-95-227-159.1984.is.") + ("@" "" "IN" "NS" "ns0.1984.is.") + ("@" "" "IN" "NS" "ns1.1984.is.") + ("@" "" "IN" "NS" "ns2.1984.is.") + ("@" "" "IN" "NS" "ns1.1984hosting.com.") + ("@" "" "IN" "NS" "ns2.1984hosting.com.") ;; domain->IP assignments ("@" "" "IN" "A" "93.95.227.159") ("@" "" "IN" "AAAA" "fe80::5054:5dff:fe5f:e39f") @@ -643,14 +643,7 @@ exim_path = /run/setuid-programs/exim \"oABCxjKDmvE86L3kCQ+MobG0BOtFBR4BqU8CAwEAAQ==\" )") ((string-append domain "._report._dmarc") "" "IN" "TXT" "\"v=DMARC1\"")) - - (append (list (zone-entry (type "NS") - (data "vps-93-95-227-159.1984.is."))) - (map (match-lambda ((ns rest ...) - (zone-entry (type "NS") - (data (string-append ns "."))))) - %1984-freedns-nameservers) - entries-sans-ns)) + entries) (define %koszko-org-zone-configuration (knot-zone-configuration @@ -663,7 +656,7 @@ exim_path = /run/setuid-programs/exim (serial 2023090200))) (acl '("allow-axfr-from-1984")) (semantic-checks? #t) - (notify (map car %1984-freedns-nameservers)))) + (notify '("1984-axfr-remote")))) (define %koszkonutek-tmp.pl.eu.org-zone-configuration (knot-zone-configuration @@ -676,7 +669,7 @@ exim_path = /run/setuid-programs/exim (serial 2023090200))) (acl '("allow-axfr-from-1984")) (semantic-checks? #t) - (notify (map car %1984-freedns-nameservers)))) + (notify '("1984-axfr-remote")))) (define knot-configuration-knot (@@ (gnu services dns) knot-configuration-knot)) @@ -728,13 +721,11 @@ log: (knot-configuration (acls (list (knot-acl-configuration (id "allow-axfr-from-1984") - (address (append-map cdr %1984-freedns-nameservers)) + (address '("93.95.224.6")) (action '(transfer))))) - (remotes (map (match-lambda ((ns addresses ...) - (knot-remote-configuration - (id ns) - (address addresses)))) - %1984-freedns-nameservers)) + (remotes (list (knot-remote-configuration + (id "1984-axfr-remote") + (address '("93.95.224.6"))))) (zones (list %koszko-org-zone-configuration %koszkonutek-tmp.pl.eu.org-zone-configuration))))) -- cgit v1.2.3