From bea9daabebfdddd2a617d291bb2985f56ef95643 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 29 Jul 2017 17:47:18 +0200
Subject: [PATCH] ssh: add control persist option

(cherry picked from commit be432c8654493005838d1d4614206f071ba4e534)
---
 modules/programs/ssh.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index 4bf02193d..e166f49b5 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -144,6 +144,15 @@ in
       '';
     };
 
+    controlPersist = mkOption {
+      type = types.str;
+      default = "no";
+      example = "10m";
+      description = ''
+        Whether control socket should remain open in the background.
+      '';
+    };
+
     matchBlocks = mkOption {
       type = types.listOf matchBlockModule;
       default = [];
@@ -158,6 +167,7 @@ in
       ForwardAgent ${yn cfg.forwardAgent}
       ControlMaster ${cfg.controlMaster}
       ControlPath ${cfg.controlPath}
+      ControlPersist ${cfg.controlPersist}
 
       ${concatStringsSep "\n\n" (map matchBlockStr cfg.matchBlocks)}
     '';