From 2c38c86d18e440bf5361b638795a704b3530448c Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 3 Sep 2023 12:11:54 +0200
Subject: l retiolum: handle connection loss better

---
 lass/2configs/retiolum.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lass/2configs/retiolum.nix')

diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index 746bc069d..c2828f6db 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -22,7 +22,6 @@
     ];
     extraConfig = ''
       AutoConnect = no
-      StrictSubnets = yes
       ${lib.optionalString (config.krebs.build.host.nets.retiolum.via != null) ''
         LocalDiscovery = no
       ''}
@@ -36,6 +35,14 @@
       "${config.krebs.build.host.nets.retiolum.ip4.addr}/16"
       "${config.krebs.build.host.nets.retiolum.ip6.addr}/16"
     ];
+    linkConfig = {
+      MTUBytes = "1377";
+      RequiredForOnline = "no";
+    };
+    networkConfig = {
+      IgnoreCarrierLoss = "10s";
+      LinkLocalAddressing = "no";
+    };
   };
 
   nixpkgs.config.packageOverrides = pkgs: {
-- 
cgit v1.2.3


From f55307fd73af235069744dd5155fda0bc73fe613 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Thu, 7 Sep 2023 12:26:31 +0200
Subject: lass: migrate away

---
 lass/2configs/retiolum.nix | 55 ----------------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 lass/2configs/retiolum.nix

(limited to 'lass/2configs/retiolum.nix')

diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
deleted file mode 100644
index c2828f6db..000000000
--- a/lass/2configs/retiolum.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-
-  krebs.iptables = {
-    tables = {
-      filter.INPUT.rules = let
-        tincport = toString config.krebs.build.host.nets.retiolum.tinc.port;
-      in [
-        { predicate = "-p tcp --dport ${tincport}"; target = "ACCEPT"; }
-        { predicate = "-p udp --dport ${tincport}"; target = "ACCEPT"; }
-      ];
-    };
-  };
-
-  krebs.tinc.retiolum = {
-    enable = true;
-    connectTo = [
-      "prism"
-      "ni"
-      "eve"
-    ];
-    extraConfig = ''
-      AutoConnect = no
-      ${lib.optionalString (config.krebs.build.host.nets.retiolum.via != null) ''
-        LocalDiscovery = no
-      ''}
-    '';
-    tincUp = lib.mkIf config.systemd.network.enable "";
-  };
-
-  systemd.network.networks.retiolum = {
-    matchConfig.Name = "retiolum";
-    address = [
-      "${config.krebs.build.host.nets.retiolum.ip4.addr}/16"
-      "${config.krebs.build.host.nets.retiolum.ip6.addr}/16"
-    ];
-    linkConfig = {
-      MTUBytes = "1377";
-      RequiredForOnline = "no";
-    };
-    networkConfig = {
-      IgnoreCarrierLoss = "10s";
-      LinkLocalAddressing = "no";
-    };
-  };
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    tinc = pkgs.tinc_pre;
-  };
-
-  environment.systemPackages = [
-    pkgs.tinc
-  ];
-}
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/95300000.lock: No such file or directory (2)