From b56ac0b9c2d726d90247b79f91df522ed2259d92 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Wed, 17 Jan 2024 17:16:20 +0000
Subject: [PATCH] Rename NixOS options according to their 23.11 names
---
nixos/modules/monitoring/exporters/node.nix | 2 +-
nixos/modules/ssh.nix | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nixos/modules/monitoring/exporters/node.nix b/nixos/modules/monitoring/exporters/node.nix
index 4a9e41b5..f48c70a1 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 90fd34b0..8e042450 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
--
GitLab