diff options
author | Domen Kožar <domen@dev.si> | 2016-08-28 13:55:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-28 13:55:28 +0200 |
commit | 4af09e00311b3c024395b59261a32a5a6a43e3fa (patch) | |
tree | 8b72eea81b13aa7ec016fe225f927fa579ff6b4f /nixos/doc/manual | |
parent | 21f2f3074063017a6580fc1c5889ee54094160ff (diff) | |
parent | 16c923cef2152d58878abac023816f05605c1f7d (diff) | |
download | nixlib-4af09e00311b3c024395b59261a32a5a6a43e3fa.tar nixlib-4af09e00311b3c024395b59261a32a5a6a43e3fa.tar.gz nixlib-4af09e00311b3c024395b59261a32a5a6a43e3fa.tar.bz2 nixlib-4af09e00311b3c024395b59261a32a5a6a43e3fa.tar.lz nixlib-4af09e00311b3c024395b59261a32a5a6a43e3fa.tar.xz nixlib-4af09e00311b3c024395b59261a32a5a6a43e3fa.tar.zst nixlib-4af09e00311b3c024395b59261a32a5a6a43e3fa.zip |
Merge pull request #14311 from Profpatsch/mkRemovedOptionModule-replacement
mkRemovedOptionModule: add replacement argument
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1603.xml | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index c51316bd2808..f460e00e836e 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -385,6 +385,41 @@ services.syncthing = { the github issue</link>. </para> </listitem> + + <listitem> + <para> + The <literal>services.xserver.startGnuPGAgent</literal> option has been removed. + GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no + longer requires (or even supports) the "start everything as a child of the + agent" scheme we've implemented in NixOS for older versions. + To configure the gpg-agent for your X session, add the following code to + <filename>~/.bashrc</filename> or some file that’s sourced when your shell is started: + <programlisting> +GPG_TTY=$(tty) +export GPG_TTY + </programlisting> + If you want to use gpg-agent for SSH, too, add the following to your session + initialization (e.g. <literal>displayManager.sessionCommands</literal>) + <programlisting> +gpg-connect-agent /bye +unset SSH_AGENT_PID +export SSH_AUTH_SOCK="''${HOME}/.gnupg/S.gpg-agent.ssh" + </programlisting> + and make sure that + <programlisting> +enable-ssh-support + </programlisting> + is included in your <filename>~/.gnupg/gpg-agent.conf</filename>. + You will need to use <command>ssh-add</command> to re-add your ssh keys. + If gpg’s automatic transformation of the private keys to the new format fails, + you will need to re-import your private keyring as well: + <programlisting> +gpg --import ~/.gnupg/secring.gpg + </programlisting> + The <command>gpg-agent(1)</command> man page has more details about this subject, + i.e. in the "EXAMPLES" section. + </para> + </listitem> </itemizedlist> |