From e391f4884522f183823ac28572220a23e2e89d2e Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 6 Oct 2025 10:14:01 +0800 Subject: [PATCH] dns: add tinc --- flake/dns/config/chn.moe.nix | 6 +++++- flake/dns/config/tinc.nix | 11 +++++++++++ flake/dns/default.nix | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 flake/dns/config/tinc.nix diff --git a/flake/dns/config/chn.moe.nix b/flake/dns/config/chn.moe.nix index 374ab8a6..1846d5bb 100644 --- a/flake/dns/config/chn.moe.nix +++ b/flake/dns/config/chn.moe.nix @@ -1,4 +1,4 @@ -localLib: +{ lib, localLib }: let cname = { @@ -42,6 +42,7 @@ let "409test" = "192.168.1.5"; }; wireguard = import ./wireguard.nix; + tinc = import ./tinc.nix; in { "" = @@ -84,3 +85,6 @@ in }) (localLib.attrsToList wireguard.peer)) (localLib.attrsToList wireguard.net))) +// lib.mapAttrs' + (n: v: lib.nameValuePair "tinc0.${n}" { type = "A"; value = "192.168.85.${builtins.toString v}"; }) + tinc diff --git a/flake/dns/config/tinc.nix b/flake/dns/config/tinc.nix new file mode 100644 index 00000000..77d1544d --- /dev/null +++ b/flake/dns/config/tinc.nix @@ -0,0 +1,11 @@ +{ + vps4 = 2; + vps6 = 1; + pc = 3; + nas = 4; + srv1-node0 = 9; + srv1-node1 = 6; + srv1-node2 = 8; + srv2-node0 = 7; + srv2-node1 = 10; +} diff --git a/flake/dns/default.nix b/flake/dns/default.nix index 5ab32939..f30ea709 100644 --- a/flake/dns/default.nix +++ b/flake/dns/default.nix @@ -4,7 +4,7 @@ let let addTtl' = attrs: attrs // { octodns.cloudflare.auto-ttl = true; }; in builtins.mapAttrs (n: v: if builtins.isList v then builtins.map addTtl' v else addTtl' v) config; config = builtins.listToAttrs (builtins.map - (domain: { name = domain; value = import ./config/${domain}.nix localLib; }) + (domain: { name = domain; value = import ./config/${domain}.nix { inherit lib localLib; }; }) [ "chn.moe" "nekomia.moe" "mirism.one" ]); configDir = symlinkJoin {