diff --git a/CHANGELOG.md b/CHANGELOG.md index c2e82de1e..ada2953e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -90,6 +90,7 @@ removed on this schedule: #### NixOS module - `settings.ephemeral_node_inactivity_timeout` is removed; set `settings.node.ephemeral.inactivity_timeout`, which headscale reads instead +- `settings.dns.split` is removed; headscale never read it, set `settings.dns.nameservers.split` ### Changes diff --git a/nix/module.nix b/nix/module.nix index 2233d9717..465fa9783 100644 --- a/nix/module.nix +++ b/nix/module.nix @@ -364,17 +364,17 @@ in List of nameservers to pass to Tailscale clients. ''; }; - }; - split = lib.mkOption { - type = lib.types.attrsOf (lib.types.listOf lib.types.str); - default = { }; - description = '' - Split DNS configuration (map of domains and which DNS server to use for each). - See . - ''; - example = { - "foo.bar.com" = [ "1.1.1.1" ]; + split = lib.mkOption { + type = lib.types.attrsOf (lib.types.listOf lib.types.str); + default = { }; + description = '' + Split DNS configuration (map of domains and which DNS server to use for each). + See . + ''; + example = { + "foo.bar.com" = [ "1.1.1.1" ]; + }; }; }; @@ -688,6 +688,7 @@ in (assertRemovedOption [ "settings" "db_port" ] "Use `database.postgres.port` instead.") (assertRemovedOption [ "settings" "db_type" ] "Use `database.type` instead.") (assertRemovedOption [ "settings" "db_user" ] "Use `database.postgres.user` instead.") + (assertRemovedOption [ "settings" "dns" "split" ] "Use `dns.nameservers.split` instead.") (assertRemovedOption [ "settings" "dns_config" ] "Use `dns` instead.") (assertRemovedOption [ "settings" "dns_config" "domains" ] "Use `dns.search_domains` instead.") (assertRemovedOption [