summary refs log tree commit diff
path: root/nixos/modules/programs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-12-18 15:30:14 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-12-18 15:34:29 +0100
commit63c14e259d4c8fc3ff706ccd620d3f794426ff1d (patch)
tree05ce7426c4e72021c3f3007b9ce5ab5cbdc1aafd /nixos/modules/programs
parent231548db50f237517187ca9778dbe45b349a8c12 (diff)
downloadnixlib-63c14e259d4c8fc3ff706ccd620d3f794426ff1d.tar
nixlib-63c14e259d4c8fc3ff706ccd620d3f794426ff1d.tar.gz
nixlib-63c14e259d4c8fc3ff706ccd620d3f794426ff1d.tar.bz2
nixlib-63c14e259d4c8fc3ff706ccd620d3f794426ff1d.tar.lz
nixlib-63c14e259d4c8fc3ff706ccd620d3f794426ff1d.tar.xz
nixlib-63c14e259d4c8fc3ff706ccd620d3f794426ff1d.tar.zst
nixlib-63c14e259d4c8fc3ff706ccd620d3f794426ff1d.zip
ssh-agent: Don't have a timeout by default
IMHO, having a short timeout (1h) defeats the point of using
ssh-agent, which is not to have to retype passphrases all the time. Of
course, users who want timeouts can set programs.ssh.agentTimeout.

This restores the 14.04 behaviour.
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r--nixos/modules/programs/ssh.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index c9bfe2fe0f70..796740ea636a 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -61,7 +61,8 @@ in
 
       agentTimeout = mkOption {
         type = types.nullOr types.string;
-        default = "1h";
+        default = null;
+        example = "1h";
         description = ''
           How long to keep the private keys in memory. Use null to keep them forever.
         '';