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

Fix typo in assert in grafana module

Browse Source 
Current assert prevents using secretKeyFile entirely
This commit is contained in:
Jean Potier 2019-08-11 13:21:26 +03:00 committed by GitHub
parent 5f01a2586a
commit 9847967594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/monitoring/grafana.nix
View File

@ -503,12 +503,12 @@ in {
message = "Cannot set both adminPassword and adminPasswordFile"; message = "Cannot set both adminPassword and adminPasswordFile";
} }
{ {
assertion = cfg.security.secretKeyFile != opt.security.secretKeyFile.default -> cfg.security.secretKeyFile == null; assertion = cfg.security.secretKey != opt.security.secretKey.default -> cfg.security.secretKeyFile == null;
message = "Cannot set both secretKey and secretKeyFile"; message = "Cannot set both secretKey and secretKeyFile";
} }
{ {
assertion = cfg.smtp.password != opt.smtp.password.default -> cfg.smtp.passwordFile == null; assertion = cfg.smtp.password != opt.smtp.password.default -> cfg.smtp.passwordFile == null;
message = "Cannot set both password and secretKeyFile"; message = "Cannot set both password and passwordFile";
} }
]; ];