summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorAndrew Marshall <andrew@johnandrewmarshall.com>2021-12-11 11:13:50 -0500
committerAndrew Marshall <andrew@johnandrewmarshall.com>2021-12-18 12:13:02 -0500
commitf10aea24347a7246a020aa6498ba857de463fd5d (patch)
tree2a5fca214a70a35d7e6c7f34cfddf9c24ca2a90f /nixos/doc/manual
parent75df464afcefd02c3463ba3ed46ad6964863998f (diff)
downloadnixpkgs-f10aea24347a7246a020aa6498ba857de463fd5d.tar
nixpkgs-f10aea24347a7246a020aa6498ba857de463fd5d.tar.gz
nixpkgs-f10aea24347a7246a020aa6498ba857de463fd5d.tar.bz2
nixpkgs-f10aea24347a7246a020aa6498ba857de463fd5d.tar.lz
nixpkgs-f10aea24347a7246a020aa6498ba857de463fd5d.tar.xz
nixpkgs-f10aea24347a7246a020aa6498ba857de463fd5d.tar.zst
nixpkgs-f10aea24347a7246a020aa6498ba857de463fd5d.zip
nixos/ssh: Add enableAskPassword
Previously, this was only implicitly enabled if xserver.enable = true.
However, Wayland-based desktops do not require this, and so configuring
SSH_ASKPASS on a Wayland desktop becomes cumbersome. This simplifies
that by adding a new option that defaults to the old conditional.
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2205.section.xml10
-rw-r--r--nixos/doc/manual/release-notes/rl-2205.section.md6
2 files changed, 16 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 716b91c3c53..52b2b38061f 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -167,6 +167,16 @@
           using this default will print a warning when rebuilt.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The option
+          <link linkend="opt-services.ssh.enableAskPassword">services.ssh.enableAskPassword</link>
+          was added, decoupling the setting of
+          <literal>SSH_ASKPASS</literal> from
+          <literal>services.xserver.enable</literal>. This allows easy
+          usage in non-X11 environments, e.g. Wayland.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 7610cfb732d..27491e7837c 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -68,3 +68,9 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.
   Configurations using this default will print a warning when rebuilt.
+
+- The option
+  [services.ssh.enableAskPassword](#opt-services.ssh.enableAskPassword) was
+  added, decoupling the setting of `SSH_ASKPASS` from
+  `services.xserver.enable`. This allows easy usage in non-X11 environments,
+  e.g. Wayland.