mirror of
https://github.com/juanfont/headscale.git
synced 2026-10-05 06:13:37 +09:00
nix: stop module.nix writing the deprecated ephemeral key
Its default made headscale warn on every start. The camelCase rename now targets node.ephemeral.inactivity_timeout, and the old path asserts.
This commit is contained in:
committed by
Kristoffer Dalby
parent
62f89ca25d
commit
f0ff407c05
+5
-11
@@ -203,16 +203,6 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
ephemeral_node_inactivity_timeout = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "30m";
|
||||
description = ''
|
||||
Time before an inactive ephemeral node is deleted.
|
||||
Deprecated: use node.ephemeral.inactivity_timeout instead.
|
||||
'';
|
||||
example = "5m";
|
||||
};
|
||||
|
||||
node = {
|
||||
expiry = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
@@ -629,7 +619,7 @@ in
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "headscale" "ephemeralNodeInactivityTimeout" ]
|
||||
[ "services" "headscale" "settings" "ephemeral_node_inactivity_timeout" ]
|
||||
[ "services" "headscale" "settings" "node" "ephemeral" "inactivity_timeout" ]
|
||||
)
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "headscale" "logLevel" ]
|
||||
@@ -710,6 +700,10 @@ in
|
||||
"oidc"
|
||||
"strip_email_domain"
|
||||
] "The strip_email_domain option got removed upstream")
|
||||
(assertRemovedOption [
|
||||
"settings"
|
||||
"ephemeral_node_inactivity_timeout"
|
||||
] "Use `node.ephemeral.inactivity_timeout` instead.")
|
||||
];
|
||||
|
||||
services.headscale.settings = lib.mkMerge [
|
||||
|
||||
Reference in New Issue
Block a user