summary refs log tree commit diff
path: root/gnu/machine
diff options
context:
space:
mode:
authorBrice Waegeneire <brice@waegenei.re>2021-06-20 15:15:55 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2021-06-20 16:44:08 +0200
commitef3f38ea0027f48feb6a29df131ac58bfbb46b7d (patch)
tree07d2cc7cd3f0e2115cf92f477ec0d8e0c6b3999b /gnu/machine
parenta211078f992bc5a26eaf787c6b01caa41de67597 (diff)
downloadguix-ef3f38ea0027f48feb6a29df131ac58bfbb46b7d.tar.gz
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 <me@tobias.gr>
Diffstat (limited to 'gnu/machine')
-rw-r--r--gnu/machine/digital-ocean.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/machine/digital-ocean.scm b/gnu/machine/digital-ocean.scm
index 82383a8c7c..d97c300d18 100644
--- a/gnu/machine/digital-ocean.scm
+++ b/gnu/machine/digital-ocean.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
+;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -256,7 +257,7 @@ cat > /etc/bootstrap-config.scm << EOF
                  (service openssh-service-type
                           (openssh-configuration
                            (log-level 'debug)
-                           (permit-root-login 'without-password))))
+                           (permit-root-login 'prohibit-password))))
            %base-services)))
 EOF
 # guix pull