about summary refs log tree commit diff
path: root/nixos/tests/google-oslogin
diff options
context:
space:
mode:
authorMatthieu Coudron <teto@users.noreply.github.com>2023-01-15 16:32:46 +0100
committerGitHub <noreply@github.com>2023-01-15 16:32:46 +0100
commitcf10d7aef8ff9ca0e178e87981d9e4fd3018193c (patch)
tree633e4d0e9ab445d1675e2b002dd29689cdf5e01d /nixos/tests/google-oslogin
parent6dccdc458512abce8d19f74195bb20fdb067df50 (diff)
services.openssh: support freeform settings (#193757)
* services.openssh: support freeform settings

Keep "extraConfig" but introduces "settings".

Also renames several options

(mkRenamedOptionModule [ "services" "openssh" "kbdInteractiveAuthentication" ] [  "services" "openssh" "settings" "KbdInteractiveAuthentication" ])
(mkRenamedOptionModule [ "services" "openssh" "passwordAuthentication" ] [  "services" "openssh" "settings" "PasswordAuthentication" ])
(mkRenamedOptionModule [ "services" "openssh" "useDns" ] [  "services" "openssh" "settings" "UseDns" ])
(mkRenamedOptionModule [ "services" "openssh" "permitRootLogin" ] [  "services" "openssh" "settings" "PermitRootLogin" ])

* updated doc
* regen doc
Diffstat (limited to 'nixos/tests/google-oslogin')
-rw-r--r--nixos/tests/google-oslogin/server.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/google-oslogin/server.nix b/nixos/tests/google-oslogin/server.nix
index faf5e847d7e95..3df41155c92d4 100644
--- a/nixos/tests/google-oslogin/server.nix
+++ b/nixos/tests/google-oslogin/server.nix
@@ -17,8 +17,8 @@ in {
   };
 
   services.openssh.enable = true;
-  services.openssh.kbdInteractiveAuthentication = false;
-  services.openssh.passwordAuthentication = false;
+  services.openssh.settings.KbdInteractiveAuthentication = false;
+  services.openssh.settings.PasswordAuthentication = false;
 
   security.googleOsLogin.enable = true;