From b934f315ddef34401fef23d005c1dfbe721fceaa Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Tue, 24 Oct 2023 23:51:25 +0100
Subject: [PATCH] ops/nixos: fixes for nixpkgs bump

---
 ops/nixos/cofractal-ams01/default.nix |  5 ++++-
 ops/nixos/etheroute-lon01/default.nix | 10 ++++++++--
 ops/nixos/lib/common.nix              |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ops/nixos/cofractal-ams01/default.nix b/ops/nixos/cofractal-ams01/default.nix
index 845f025bd5..a00c7c6053 100644
--- a/ops/nixos/cofractal-ams01/default.nix
+++ b/ops/nixos/cofractal-ams01/default.nix
@@ -151,7 +151,10 @@ in
         mode = "802.3ad";
       };
     };
-    defaultGateway6.address = "2a09:a446:1337:ffff::1";
+    defaultGateway6 = {
+      address = "2a09:a446:1337:ffff::1";
+      interface = "bond0";
+    };
     interfaces.bond0 = {
       ipv6.addresses = [
         { address = "2a09:a446:1337::10"; prefixLength = 64; }
diff --git a/ops/nixos/etheroute-lon01/default.nix b/ops/nixos/etheroute-lon01/default.nix
index da2f65c1af..18a4a3a30f 100644
--- a/ops/nixos/etheroute-lon01/default.nix
+++ b/ops/nixos/etheroute-lon01/default.nix
@@ -84,8 +84,14 @@
       "8.8.8.8"
       "8.8.4.4"
     ];
-    defaultGateway.address = "103.141.25.49";
-    defaultGateway6.address = "2a07:242:800:64::1";
+    defaultGateway = {
+      address = "103.141.25.49";
+      interface = "eno1";
+    };
+    defaultGateway6 = {
+      address = "2a07:242:800:64::1";
+      interface = "eno1";
+    };
     interfaces.eno1 = {
       ipv4.addresses = [{ address = "103.141.25.50"; prefixLength = 30; }];
       ipv6.addresses = [{ address = "2a07:242:800:64::68"; prefixLength = 64; }];
diff --git a/ops/nixos/lib/common.nix b/ops/nixos/lib/common.nix
index 6ba2c3fe36..b2c667f7c4 100644
--- a/ops/nixos/lib/common.nix
+++ b/ops/nixos/lib/common.nix
@@ -158,7 +158,7 @@ in
     security.pam.ussh = {
       enable = true;
       control = "sufficient";
-      caFile = ../../secrets/client-ca.pub;
+      caFile = toString ../../secrets/client-ca.pub;
     };
 
     users.mutableUsers = false;