ssh-agent: make key timeout optional

This commit is contained in:
Aristid Breitkreuz 2014-11-15 12:13:19 +01:00
parent d70336f37c
commit d57110fabc

View File

@ -63,7 +63,7 @@ in
type = types.string; type = types.string;
default = "1h"; default = "1h";
description = '' description = ''
How long to keep the private keys in memory. How long to keep the private keys in memory. Use null to keep them forever.
''; '';
}; };
@ -107,7 +107,10 @@ in
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
serviceConfig = serviceConfig =
{ ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent"; { ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent";
ExecStart = "${cfg.package}/bin/ssh-agent -t ${cfg.agentTimeout} -a %t/ssh-agent"; ExecStart =
"${cfg.package}/bin/ssh-agent " +
optionalString (cfg.agentTimeout != null) ("-t ${cfg.agentTimeout} ") +
"-a %t/ssh-agent";
StandardOutput = "null"; StandardOutput = "null";
Type = "forking"; Type = "forking";
Restart = "on-failure"; Restart = "on-failure";