diff --git a/nixos/modules/monitoring/exporters/node.nix b/nixos/modules/monitoring/exporters/node.nix index 4a9e41b5c840852323aaf952859e79b4c878a870..f48c70a1aca88cdfd43f37201b7c42b1807ed3b2 100644 --- a/nixos/modules/monitoring/exporters/node.nix +++ b/nixos/modules/monitoring/exporters/node.nix @@ -69,7 +69,7 @@ in { ] ++ ( optionals (config.services.nfs.server.enable) [ "nfsd" ] ) ++ ( - optionals ("" != config.boot.initrd.services.swraid.mdadmConf) [ "mdadm" ] + optionals ("" != config.boot.swraid.mdadmConf) [ "mdadm" ] ) ++ ( optionals ({} != config.networking.bonds) [ "bonding" ] ) ++ ( diff --git a/nixos/modules/ssh.nix b/nixos/modules/ssh.nix index 90fd34b002c607965038a574334fb0fc370d146c..8e0424506f1cb2bf3367fb895a74ebde36e99897 100644 --- a/nixos/modules/ssh.nix +++ b/nixos/modules/ssh.nix @@ -26,8 +26,8 @@ enable = true; # We only allow key-based authentication. - kbdInteractiveAuthentication = false; - passwordAuthentication = false; + settings.KbdInteractiveAuthentication = false; + settings.PasswordAuthentication = false; extraConfig = '' # Possibly this is superfluous considering we don't allow