colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/acme: fix assertion, add actual values to message (#263543)

Browse Source
This commit is contained in:
K900 2023-10-26 12:28:43 +03:00 committed by GitHub
parent 56ffb3d80f
commit 5438b83028
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/security/acme/default.nix
View File

@ -938,13 +938,10 @@ in {
and remove the wildcard from the path. and remove the wildcard from the path.
''; '';
} }
{ (let exclusiveAttrs = {
assertion = lib.length (lib.filter (x: x != null) [ inherit (data) dnsProvider webroot listenHTTP s3Bucket;
data.dnsProvider }; in {
data.webroot assertion = lib.length (lib.filter (x: x != null) (builtins.attrValues exclusiveAttrs)) == 1;
data.listenHTTP
data.s3Bucket
]) != 1;
message = '' message = ''
Exactly one of the options Exactly one of the options
`security.acme.certs.${cert}.dnsProvider`, `security.acme.certs.${cert}.dnsProvider`,
@ -952,8 +949,9 @@ in {
`security.acme.certs.${cert}.listenHTTP` and `security.acme.certs.${cert}.listenHTTP` and
`security.acme.certs.${cert}.s3Bucket` `security.acme.certs.${cert}.s3Bucket`
is required. is required.
Current values: ${(lib.generators.toPretty {} exclusiveAttrs)}.
''; '';
} })
{ {
assertion = all (hasSuffix "_FILE") (attrNames data.credentialFiles); assertion = all (hasSuffix "_FILE") (attrNames data.credentialFiles);
message = '' message = ''