Skip to content

Fix flake not accepting keyFile option #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ClusterM merged 2 commits into from
Apr 2, 2026
Merged

Fix flake not accepting keyFile option #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df8fbb4
Fix flake not accepting keyFile option
Mar 18, 2026
da665fb
Apply suggestions from code review
ClusterM Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@
};

key = mkOption {
type = types.str;
description = "Obfuscation key (must match on both sides)";
type = types.nullOr types.str;
default = null;
description = "Obfuscation key (must match on both sides; required when keyFile is not set)";
example = "your_secret_key";
};

Expand Down Expand Up @@ -202,9 +203,17 @@
}
{
assertion = all (inst:
inst.enable -> (inst.key != "" || inst.keyFile != null)
inst.enable ->
(
inst.keyFile != null
|| (
inst.key != null
&& builtins.stringLength inst.key >= 1
&& builtins.stringLength inst.key <= 255
)
)
) (attrValues cfg.instances);
message = "Each enabled wg-obfuscator instance must have either 'key' or 'keyFile' set";
message = "Each enabled wg-obfuscator instance must have either 'keyFile' set, or 'key' set to a string of length 1–255 characters";
}
];

Expand Down Expand Up @@ -263,7 +272,7 @@
max-clients = ${toString inst.maxClients}
idle-timeout = ${toString inst.idleTimeout}
max-dummy = ${toString inst.maxDummy}
'') (attrValues instances)
'') instances
)}
EOF

Expand Down
Loading