mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 19:55:41 +03:00
headscale: 0.25.1 -> 0.26.0, update nixos module and test accordingly
Co-authored-by: Sandro <7258858+SuperSandro2000@users.noreply.github.com> Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
parent
3d576164da
commit
0dd5cdaa3b
4 changed files with 14 additions and 16 deletions
|
@ -406,14 +406,6 @@ in
|
|||
'';
|
||||
example = [ "alice@example.com" ];
|
||||
};
|
||||
|
||||
strip_email_domain = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether the domain part of the email address should be removed when generating namespaces.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
tls_letsencrypt_hostname = lib.mkOption {
|
||||
|
@ -585,6 +577,11 @@ in
|
|||
"dns_config"
|
||||
"nameservers"
|
||||
] "Use `dns.nameservers.global` instead.")
|
||||
(assertRemovedOption [
|
||||
"settings"
|
||||
"oidc"
|
||||
"strip_email_domain"
|
||||
] "The strip_email_domain option got removed upstream")
|
||||
];
|
||||
|
||||
services.headscale.settings = lib.mkMerge [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue