about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-11-30 09:10:16 -0500
committerGitHub <noreply@github.com>2023-11-30 09:10:16 -0500
commit64d626bc6ded83efc8a86a5b9aa65d1750f9f6d5 (patch)
tree305c2fd41399b75d27670e84bbd0a116665a9e0b /nixos/modules
parent7c0bc109be096f752b9f58ffb3312e1bb94fc8e5 (diff)
parent0cb6160d8febf762b3af9f347a274f72566d525d (diff)
Merge pull request #270384 from NixOS/backport-252747-to-release-23.11
[Backport release-23.11] nixos/syncoid: use string type for sshKey options
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/backup/syncoid.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix
index 1a1df38617b55..f770108295759 100644
--- a/nixos/modules/services/backup/syncoid.nix
+++ b/nixos/modules/services/backup/syncoid.nix
@@ -123,9 +123,7 @@ in
     };
 
     sshKey = mkOption {
-      type = types.nullOr types.path;
-      # Prevent key from being copied to store
-      apply = mapNullable toString;
+      type = with types; nullOr (coercedTo path toString str);
       default = null;
       description = lib.mdDoc ''
         SSH private key file to use to login to the remote system. Can be
@@ -205,9 +203,7 @@ in
           recursive = mkEnableOption (lib.mdDoc ''the transfer of child datasets'');
 
           sshKey = mkOption {
-            type = types.nullOr types.path;
-            # Prevent key from being copied to store
-            apply = mapNullable toString;
+            type = with types; nullOr (coercedTo path toString str);
             description = lib.mdDoc ''
               SSH private key file to use to login to the remote system.
               Defaults to {option}`services.syncoid.sshKey` option.