From 28e7704f444a3670cebca438e14586bae3d95cf2 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sat, 15 Apr 2023 14:36:22 +0000
Subject: [PATCH] ops/nixos: move tailscale/systemd-networkd fixes to lib/bgp

---
 ops/nixos/cofractal-ams01/default.nix | 2 --
 ops/nixos/howl/default.nix            | 1 -
 ops/nixos/lib/bgp.nix                 | 3 +++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ops/nixos/cofractal-ams01/default.nix b/ops/nixos/cofractal-ams01/default.nix
index 5649af2997..7bb283b0f2 100644
--- a/ops/nixos/cofractal-ams01/default.nix
+++ b/ops/nixos/cofractal-ams01/default.nix
@@ -168,8 +168,6 @@ in
     }
   ];
 
-  services.tailscale.package = depot.nix.pkgs.tailscale;
-  systemd.network.config.networkConfig.ManageForeignRoutes = "no";
   systemd.mounts = let
     bindMount' = dir: {
       unitConfig.RequiresMountsFor = dir;
diff --git a/ops/nixos/howl/default.nix b/ops/nixos/howl/default.nix
index 4977c46a8f..89f1878290 100644
--- a/ops/nixos/howl/default.nix
+++ b/ops/nixos/howl/default.nix
@@ -10,7 +10,6 @@ in {
     ../lib/zfs.nix
     ../lib/graphical-client-wayland.nix
     ../lib/whitby-distributed.nix
-    ../lib/bgp.nix
   ];
 
   boot.initrd.availableKernelModules = [
diff --git a/ops/nixos/lib/bgp.nix b/ops/nixos/lib/bgp.nix
index 0d6c56b5eb..721d35f3f1 100644
--- a/ops/nixos/lib/bgp.nix
+++ b/ops/nixos/lib/bgp.nix
@@ -407,5 +407,8 @@ in {
       "net.ipv6.conf.default.autoconf" = 0;
       "net.ipv6.conf.all.autoconf" = 0;
     };  
+
+    services.tailscale.package = depot.nix.pkgs.tailscale;
+    systemd.network.config.networkConfig.ManageForeignRoutes = "no";
   };
 }