From a1a4eedd72ca264aea483dcd165d1a3d45f1d1d6 Mon Sep 17 00:00:00 2001 From: Constantin Gierczak--Galle Date: Fri, 22 Nov 2024 21:52:30 +0100 Subject: [PATCH 1/5] feat(dns01): add nodes subdomains --- machines/dns01/beta.dgnum.eu.nix | 35 ++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/machines/dns01/beta.dgnum.eu.nix b/machines/dns01/beta.dgnum.eu.nix index 44d903d..d7129c3 100644 --- a/machines/dns01/beta.dgnum.eu.nix +++ b/machines/dns01/beta.dgnum.eu.nix @@ -3,9 +3,11 @@ with dns.lib.combinators; { SOA = { - nameServer = "ns1"; - adminEmail = "webmaster@dgnum.eu"; + nameServer = "ns01.beta.dgnum.eu"; + adminEmail = "dns@dgnum.eu"; serial = 2019030800; + retry = 3600; + minimum = 300; }; NS = [ @@ -16,7 +18,36 @@ with dns.lib.combinators; #AAAA = [ "4321:0:1:2:3:4:567:89ab" ]; subdomains = { + # Hosted services + # NOTE: for now manually supplied, in the future automatically filled in photoprism = host "129.199.146.101" null; immich = host "129.199.146.101" null; + + # Nameservers + # TODO: fill this in + ns01 = host "" null; + + # *.infra.beta.dgnum.eu + infra = { + subdomains = mapAttrs' ( + host: + { site, ... }: + # NOTE: Originally "${host}.${site}" + # I think it makes sense to ditch the site info in the case of the lab + nameValuePair "${host}" ( + with meta.network.${host}.addresses; + { + A = ipv4; + # FIXME: Enable ipv6 in all VM nodes + + #AAAA = ipv6; + subdomains = { + v4.A = ipv4; + #v6.AAAA = ipv6; + }; + } + ) + ) meta.nodes; + }; }; } From 28c5c5998fa118b4d050df31082b3d9fca8c619e Mon Sep 17 00:00:00 2001 From: Constantin Gierczak--Galle Date: Fri, 22 Nov 2024 21:53:40 +0100 Subject: [PATCH 2/5] fix(dns01): fmt --- machines/dns01/beta.dgnum.eu.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/dns01/beta.dgnum.eu.nix b/machines/dns01/beta.dgnum.eu.nix index d7129c3..0b14597 100644 --- a/machines/dns01/beta.dgnum.eu.nix +++ b/machines/dns01/beta.dgnum.eu.nix @@ -31,7 +31,7 @@ with dns.lib.combinators; infra = { subdomains = mapAttrs' ( host: - { site, ... }: + { ... }: # NOTE: Originally "${host}.${site}" # I think it makes sense to ditch the site info in the case of the lab nameValuePair "${host}" ( From a87d2160d4ca9cc30121a92dbdaafcfe3e588825 Mon Sep 17 00:00:00 2001 From: Constantin Gierczak--Galle Date: Fri, 22 Nov 2024 21:54:00 +0100 Subject: [PATCH 3/5] fix(dns01): fmt --- machines/dns01/beta.dgnum.eu.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/dns01/beta.dgnum.eu.nix b/machines/dns01/beta.dgnum.eu.nix index 0b14597..d57466b 100644 --- a/machines/dns01/beta.dgnum.eu.nix +++ b/machines/dns01/beta.dgnum.eu.nix @@ -31,7 +31,7 @@ with dns.lib.combinators; infra = { subdomains = mapAttrs' ( host: - { ... }: + { _ }: # NOTE: Originally "${host}.${site}" # I think it makes sense to ditch the site info in the case of the lab nameValuePair "${host}" ( From 5ba783f724c7f2c5ee2a26ec00cb56b8668012b5 Mon Sep 17 00:00:00 2001 From: Constantin Gierczak--Galle Date: Fri, 22 Nov 2024 22:16:04 +0100 Subject: [PATCH 4/5] fix(dns01): import lib and meta --- machines/dns01/beta.dgnum.eu.nix | 14 ++++++++------ machines/dns01/nsd.nix | 5 +++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/machines/dns01/beta.dgnum.eu.nix b/machines/dns01/beta.dgnum.eu.nix index d57466b..804961b 100644 --- a/machines/dns01/beta.dgnum.eu.nix +++ b/machines/dns01/beta.dgnum.eu.nix @@ -1,5 +1,9 @@ -{ dns, ... }: +{ dns, lib, ... }: +let + inherit (lib) mapAttrs' nameValuePair; + meta = (import ./../../meta) lib; +in with dns.lib.combinators; { SOA = { @@ -25,16 +29,14 @@ with dns.lib.combinators; # Nameservers # TODO: fill this in - ns01 = host "" null; + #ns01 = host "" null; # *.infra.beta.dgnum.eu infra = { subdomains = mapAttrs' ( host: - { _ }: - # NOTE: Originally "${host}.${site}" - # I think it makes sense to ditch the site info in the case of the lab - nameValuePair "${host}" ( + { site, ... }: + nameValuePair "${host}.${site}" ( with meta.network.${host}.addresses; { A = ipv4; diff --git a/machines/dns01/nsd.nix b/machines/dns01/nsd.nix index 41f4ec8..a697d2f 100644 --- a/machines/dns01/nsd.nix +++ b/machines/dns01/nsd.nix @@ -1,4 +1,4 @@ -{ sources, ... }: +{ sources, lib, ... }: let dns = import sources.dns-nix { }; @@ -10,7 +10,8 @@ in "beta.dgnum.eu" = { # provideXFR = [ ... ]; # notify = [ ... ]; - data = dns.lib.toString "beta.dgnum.eu" (import ./beta.dgnum.eu.nix { inherit dns; }); + data = dns.lib.toString "beta.dgnum.eu" (import ./beta.dgnum.eu.nix { + inherit dns lib; }); }; }; }; From 1456cf626ebea7d5aaaa8996e1db70f7d0ef4144 Mon Sep 17 00:00:00 2001 From: Constantin Gierczak--Galle Date: Fri, 22 Nov 2024 22:16:22 +0100 Subject: [PATCH 5/5] style(dns01): fmt --- machines/dns01/beta.dgnum.eu.nix | 2 +- machines/dns01/nsd.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/machines/dns01/beta.dgnum.eu.nix b/machines/dns01/beta.dgnum.eu.nix index 804961b..9171c14 100644 --- a/machines/dns01/beta.dgnum.eu.nix +++ b/machines/dns01/beta.dgnum.eu.nix @@ -1,6 +1,6 @@ { dns, lib, ... }: -let +let inherit (lib) mapAttrs' nameValuePair; meta = (import ./../../meta) lib; in diff --git a/machines/dns01/nsd.nix b/machines/dns01/nsd.nix index a697d2f..323e417 100644 --- a/machines/dns01/nsd.nix +++ b/machines/dns01/nsd.nix @@ -10,8 +10,7 @@ in "beta.dgnum.eu" = { # provideXFR = [ ... ]; # notify = [ ... ]; - data = dns.lib.toString "beta.dgnum.eu" (import ./beta.dgnum.eu.nix { - inherit dns lib; }); + data = dns.lib.toString "beta.dgnum.eu" (import ./beta.dgnum.eu.nix { inherit dns lib; }); }; }; };