Compare commits

..

No commits in common. "1456cf626ebea7d5aaaa8996e1db70f7d0ef4144" and "225ced72c219a3bc49ab6b5b22510c8a19318d4a" have entirely different histories.

2 changed files with 5 additions and 38 deletions

View file

@ -1,17 +1,11 @@
{ dns, lib, ... }:
{ dns, ... }:
let
inherit (lib) mapAttrs' nameValuePair;
meta = (import ./../../meta) lib;
in
with dns.lib.combinators;
{
SOA = {
nameServer = "ns01.beta.dgnum.eu";
adminEmail = "dns@dgnum.eu";
nameServer = "ns1";
adminEmail = "webmaster@dgnum.eu";
serial = 2019030800;
retry = 3600;
minimum = 300;
};
NS = [
@ -22,34 +16,7 @@ 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, ... }:
nameValuePair "${host}.${site}" (
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;
};
};
}

View file

@ -1,4 +1,4 @@
{ sources, lib, ... }:
{ sources, ... }:
let
dns = import sources.dns-nix { };
@ -10,7 +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; });
};
};
};