From 6e746fb2cff3d2d3b173f45bc024480780e3f166 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sat, 30 Apr 2022 16:48:28 +0100
Subject: [PATCH] etheroute-lon01: use gre rather than ipip

Cloudflare Magic Transit appears to become Very Unhappy when you blast it with IPIP.

Use GRE instead, which it is happier with.
---
 ops/nixos/etheroute-lon01/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ops/nixos/etheroute-lon01/default.nix b/ops/nixos/etheroute-lon01/default.nix
index 87039f141e..e2f3681ecc 100644
--- a/ops/nixos/etheroute-lon01/default.nix
+++ b/ops/nixos/etheroute-lon01/default.nix
@@ -167,12 +167,12 @@ in {
   };
   my.ip.tailscale = "100.111.191.21";
 
-  systemd.services.quadv1-4-netdev = lib.mkForce (makeIPIPInterface {
-    name =  "quadv1-4";
-    underlayDevice = "eno1";
-    localIP = "83.97.19.68";
-    remoteIP = "82.163.116.114";
-  });
+  networking.greTunnels.quadv1-4 = {
+    remote = "82.163.116.114";
+    local = "83.97.19.68";
+    dev = "eno1";
+    type = "tun";
+  };
 
   services.openssh.hostKeys = [
     {