about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-09-21 06:01:07 +0000
committerGitHub <noreply@github.com>2023-09-21 06:01:07 +0000
commit743d7baa31ff74f2e1dbf09a6ea38a7e24aedfc3 (patch)
tree12fe4c1eeed5d6c5aa144c991cd4dc520d43a7d9 /nixos
parent0093611d8eea26147d483e8bf82ce83d1ad3604d (diff)
parentedd1e27480f56ffda9e419024f34af80f83f293c (diff)
downloadnixlib-743d7baa31ff74f2e1dbf09a6ea38a7e24aedfc3.tar
nixlib-743d7baa31ff74f2e1dbf09a6ea38a7e24aedfc3.tar.gz
nixlib-743d7baa31ff74f2e1dbf09a6ea38a7e24aedfc3.tar.bz2
nixlib-743d7baa31ff74f2e1dbf09a6ea38a7e24aedfc3.tar.lz
nixlib-743d7baa31ff74f2e1dbf09a6ea38a7e24aedfc3.tar.xz
nixlib-743d7baa31ff74f2e1dbf09a6ea38a7e24aedfc3.tar.zst
nixlib-743d7baa31ff74f2e1dbf09a6ea38a7e24aedfc3.zip
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/google-compute-config.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index cf94ce0faf36..3c503f027d79 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -39,7 +39,7 @@ in
   # Allow root logins only using SSH keys
   # and disable password authentication in general
   services.openssh.enable = true;
-  services.openssh.settings.PermitRootLogin = "prohibit-password";
+  services.openssh.settings.PermitRootLogin = mkDefault "prohibit-password";
   services.openssh.settings.PasswordAuthentication = mkDefault false;
 
   # enable OS Login. This also requires setting enable-oslogin=TRUE metadata on