From ea9dbc8caf3111f80cc94de51eb6d6dace05e3c4 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 27 Dec 2022 12:20:42 +0100
Subject: types host: remove cores

---
 lass/2configs/default.nix | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 49a04e9c2..e649c0dea 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -69,7 +69,6 @@ with import <stockholm/lib>;
   ];
 
   networking.hostName = config.krebs.build.host.name;
-  nix.maxJobs = config.krebs.build.host.cores;
 
   krebs = {
     enable = true;
-- 
cgit v1.2.3


From 2ebbec1f2d9c16fe084abba87718d0f60e61bf88 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 30 Dec 2022 21:34:05 +0100
Subject: krebs.iptables: precedence -> mkOrder

---
 lass/2configs/default.nix | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

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

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index e649c0dea..3d7188dc6 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -189,28 +189,34 @@ with import <stockholm/lib>;
     enable = true;
     tables = {
       nat.PREROUTING.rules = [
-        { predicate = "-i retiolum -p tcp -m tcp --dport 22"; target = "ACCEPT"; precedence = 101; }
-        { predicate = "-i wiregrill -p tcp -m tcp --dport 22"; target = "ACCEPT"; precedence = 101; }
-        { predicate = "-p tcp -m tcp --dport 22"; target = "REDIRECT --to-ports 0"; precedence = 100; }
-        { predicate = "-p tcp -m tcp --dport 45621"; target = "REDIRECT --to-ports 22"; precedence = 99; }
+        { predicate = "-i retiolum -p tcp -m tcp --dport 22"; target = "ACCEPT"; }
+        { predicate = "-i wiregrill -p tcp -m tcp --dport 22"; target = "ACCEPT"; }
+        { predicate = "-p tcp -m tcp --dport 22"; target = "REDIRECT --to-ports 0"; }
+        { predicate = "-p tcp -m tcp --dport 45621"; target = "REDIRECT --to-ports 22"; }
       ];
       nat.OUTPUT.rules = [
-        { predicate = "-o lo -p tcp -m tcp --dport 45621"; target = "REDIRECT --to-ports 22"; precedence = 100; }
+        { predicate = "-o lo -p tcp -m tcp --dport 45621"; target = "REDIRECT --to-ports 22"; }
       ];
       filter.INPUT.policy = "DROP";
       filter.FORWARD.policy = "DROP";
-      filter.INPUT.rules = [
-        { predicate = "-i retiolum -p udp --dport 60000:61000"; target = "ACCEPT";}
-        { predicate = "-m conntrack --ctstate RELATED,ESTABLISHED"; target = "ACCEPT"; precedence = 10001; }
-        { predicate = "-p icmp"; target = "ACCEPT"; precedence = 10000; }
-        { predicate = "-p ipv6-icmp"; target = "ACCEPT"; v4 = false;  precedence = 10000; }
-        { predicate = "-i lo"; target = "ACCEPT"; precedence = 9999; }
-        { predicate = "-p tcp --dport 22"; target = "ACCEPT"; precedence = 9998; }
-        { predicate = "-p tcp -i retiolum"; target = "REJECT --reject-with tcp-reset"; precedence = -10000; }
-        { predicate = "-p udp -i retiolum"; target = "REJECT --reject-with icmp-port-unreachable"; v6 = false; precedence = -10000; }
-        { predicate = "-i retiolum"; target = "REJECT --reject-with icmp-proto-unreachable"; v6 = false; precedence = -10000; }
-        { predicate = "-i retiolum -p udp -m udp --dport 53"; target = "ACCEPT"; }
-        { predicate = "-i retiolum -p tcp --dport 19999"; target = "ACCEPT"; }
+      filter.INPUT.rules = mkMerge [
+        (mkBefore [
+          { predicate = "-m conntrack --ctstate RELATED,ESTABLISHED"; target = "ACCEPT"; }
+          { predicate = "-p icmp"; target = "ACCEPT"; }
+          { predicate = "-p ipv6-icmp"; target = "ACCEPT"; v4 = false;  }
+          { predicate = "-i lo"; target = "ACCEPT"; }
+          { predicate = "-p tcp --dport 22"; target = "ACCEPT"; }
+        ])
+        (mkOrder 1000 [
+          { predicate = "-i retiolum -p udp --dport 60000:61000"; target = "ACCEPT"; }
+          { predicate = "-i retiolum -p udp -m udp --dport 53"; target = "ACCEPT"; }
+          { predicate = "-i retiolum -p tcp --dport 19999"; target = "ACCEPT"; }
+        ])
+        (mkAfter [
+          { predicate = "-p tcp -i retiolum"; target = "REJECT --reject-with tcp-reset"; }
+          { predicate = "-p udp -i retiolum"; target = "REJECT --reject-with icmp-port-unreachable"; v6 = false; }
+          { predicate = "-i retiolum"; target = "REJECT --reject-with icmp-proto-unreachable"; v6 = false; }
+        ])
       ];
     };
   };
-- 
cgit v1.2.3