From ef3f38ea0027f48feb6a29df131ac58bfbb46b7d Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 20 Jun 2021 15:15:55 +0200 Subject: services: openssh: Replace 'without-password' by 'prohibit-password'. For some time, OpenSSH's option 'PermitRootLogin' has deprecated the ambiguous argument 'without-password' with 'prohibit-password'. * doc/guix.texi (Network Services): Replace 'without-password by 'prohibit-password. * gnu/machine/digital-ocean.scm (guix-infect): Change system configuration to use 'prohibit-password. * gnu/services/ssh.scm (openssh-configuration): Change comment to use 'prohibit-password. (openssh-config-file): Add support for 'prohibit-password to 'permit-root-login'. Warn about deprecated 'without-password usage. * gnu/tests/ganeti.scm (%ganeti-os): Replace 'without-password by 'prohibit-password. Signed-off-by: Tobias Geerinckx-Rice --- doc/guix.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index efeb176e3d..66c6adc4f5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17070,7 +17070,7 @@ shell daemon, @command{sshd}. Its value must be an (service openssh-service-type (openssh-configuration (x11-forwarding? #t) - (permit-root-login 'without-password) + (permit-root-login 'prohibit-password) (authorized-keys `(("alice" ,(local-file "alice.pub")) ("bob" ,(local-file "bob.pub")))))) @@ -17104,7 +17104,7 @@ TCP port on which @command{sshd} listens for incoming connections. @item @code{permit-root-login} (default: @code{#f}) This field determines whether and when to allow logins as root. If @code{#f}, root logins are disallowed; if @code{#t}, they are allowed. -If it's the symbol @code{'without-password}, then root logins are +If it's the symbol @code{'prohibit-password}, then root logins are permitted but not with password-based authentication. @item @code{allow-empty-passwords?} (default: @code{#f}) @@ -29333,7 +29333,7 @@ cluster node that supports multiple storage backends, and installs the ;; Ganeti uses SSH to communicate between nodes. (service openssh-service-type (openssh-configuration - (permit-root-login 'without-password))) + (permit-root-login 'prohibit-password))) (service ganeti-service-type (ganeti-configuration -- cgit v1.2.3