From ad9254cd9af9165000ecd6ef9c23c2b8ceda01c7 Mon Sep 17 00:00:00 2001 From: Isaac Grannis <115715725+BagMan9@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:19:45 -0500 Subject: [PATCH] vdirsyncer: fix verify option type (#5096) * vdirsyncer: change verify to type path accounts..accounts..vdirsyncer.verify should not be a bool, it should be a path. * vdirsyncer: Add example of verify use --- modules/programs/vdirsyncer-accounts.nix | 5 +++-- modules/programs/vdirsyncer.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/programs/vdirsyncer-accounts.nix b/modules/programs/vdirsyncer-accounts.nix index fac4d01da..4edd17429 100644 --- a/modules/programs/vdirsyncer-accounts.nix +++ b/modules/programs/vdirsyncer-accounts.nix @@ -93,9 +93,10 @@ in { }; verify = mkOption { - type = types.nullOr types.bool; + type = types.nullOr types.path; default = null; - description = "Verify SSL certificate."; + description = "Null or path to certificate to verify SSL against"; + example = "/path/to/cert.pem"; }; verifyFingerprint = mkOption { diff --git a/modules/programs/vdirsyncer.nix b/modules/programs/vdirsyncer.nix index 545df71b5..32c003394 100644 --- a/modules/programs/vdirsyncer.nix +++ b/modules/programs/vdirsyncer.nix @@ -92,7 +92,7 @@ let else if (n == "passwordPrompt") then ''password.fetch = ["prompt", "${v}"]'' else if (n == "verify") then - "verify = ${if v then "true" else "false"}" + ''verify = "${v}"'' else if (n == "verifyFingerprint") then ''verify_fingerprint = "${v}"'' else if (n == "auth") then