diff --git a/newinfra/nix/modules/dns/default.nix b/newinfra/nix/modules/dns/default.nix index 41a1439..4f28471 100644 --- a/newinfra/nix/modules/dns/default.nix +++ b/newinfra/nix/modules/dns/default.nix @@ -32,7 +32,7 @@ file: ${import ./noratrieb.dev.nix { inherit pkgs lib networkingConfig; }} - domain: nilstrieb.dev storage: /var/lib/knot/zones/ - file: ${import ./nilstrieb.dev.nix { inherit pkgs lib; }} + file: ${import ./nilstrieb.dev.nix { inherit pkgs lib networkingConfig; }} log: - target: syslog any: info diff --git a/newinfra/nix/modules/dns/nilstrieb.dev.nix b/newinfra/nix/modules/dns/nilstrieb.dev.nix index 6bb11f3..af09ad8 100644 --- a/newinfra/nix/modules/dns/nilstrieb.dev.nix +++ b/newinfra/nix/modules/dns/nilstrieb.dev.nix @@ -1,14 +1,17 @@ # https://github.com/nix-community/dns.nix -{ pkgs, lib, ... }: +{ pkgs, lib, networkingConfig, ... }: let data = with pkgs.nix-dns.lib.combinators; let hour1 = 3600; hostsToDns = builtins.mapAttrs - (name: { publicIPv4, publicIPv6 }: + (name: { publicIPv4, publicIPv6, ... }: lib.optionalAttrs (publicIPv4 != null) { A = [ (ttl hour1 (a publicIPv4)) ]; } // lib.optionalAttrs (publicIPv6 != null) { AAAA = [ (ttl hour1 (aaaa publicIPv6)) ]; }) networkingConfig; + vps2 = { + A = [ "184.174.32.252" ]; + }; in with hostsToDns; { diff --git a/newinfra/nix/modules/dns/noratrieb.dev.nix b/newinfra/nix/modules/dns/noratrieb.dev.nix index 3c4aad0..4a27b2a 100644 --- a/newinfra/nix/modules/dns/noratrieb.dev.nix +++ b/newinfra/nix/modules/dns/noratrieb.dev.nix @@ -5,7 +5,7 @@ let let hour1 = 3600; hostsToDns = builtins.mapAttrs - (name: { publicIPv4, publicIPv6 }: + (name: { publicIPv4, publicIPv6, ... }: lib.optionalAttrs (publicIPv4 != null) { A = [ (ttl hour1 (a publicIPv4)) ]; } // lib.optionalAttrs (publicIPv6 != null) { AAAA = [ (ttl hour1 (aaaa publicIPv6)) ]; }) networkingConfig;