diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-18 22:03:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 22:03:59 +0200 |
| commit | ba1330b12e654f28f090a554be3b52ef8e01e046 (patch) | |
| tree | 1443a1935dd841938edc5508286e5a07309d7f6c /nixos | |
| parent | f8d79426fadfd2c66fb82d1be1248f8ab4b81c56 (diff) | |
| parent | 994ffc01a04e4793fcfe360117564df904d44049 (diff) | |
| download | nixpkgs-ba1330b12e654f28f090a554be3b52ef8e01e046.tar nixpkgs-ba1330b12e654f28f090a554be3b52ef8e01e046.tar.gz nixpkgs-ba1330b12e654f28f090a554be3b52ef8e01e046.tar.bz2 nixpkgs-ba1330b12e654f28f090a554be3b52ef8e01e046.tar.lz nixpkgs-ba1330b12e654f28f090a554be3b52ef8e01e046.tar.xz nixpkgs-ba1330b12e654f28f090a554be3b52ef8e01e046.tar.zst nixpkgs-ba1330b12e654f28f090a554be3b52ef8e01e046.zip | |
Merge pull request #26605 from mayflower/disable-ssh-agent
ssh module: disable agent by default
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1709.xml | 9 | ||||
| -rw-r--r-- | nixos/modules/programs/ssh.nix | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index b1bef8ef1c2..34cfe1702e9 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -104,6 +104,15 @@ rmdir /var/lib/ipfs/.ipfs <literal>dataDir</literal>. </para> </listitem> + <listitem> + <para> + The <literal>ssh-agent</literal> user service is not started by default + anymore. Use <literal>programs.ssh.startAgent</literal> to enable it if + needed. There is also a new <literal>programs.gnupg.agent</literal> + module that creates a <literal>gpg-agent</literal> user service. It can + also serve as a SSH agent if <literal>enableSSHSupport</literal> is set. + </para> + </listitem> </itemizedlist> diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 4faef2c609b..e0fbba897fa 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -74,7 +74,7 @@ in startAgent = mkOption { type = types.bool; - default = true; + default = false; description = '' Whether to start the OpenSSH agent when you log in. The OpenSSH agent remembers private keys for you so that you don't have to type in |