jerrita 3 months ago
parent
commit
9b5b2baf36
4 changed files with 3 additions and 4 deletions
  1. 0 1
      networking/default.nix
  2. 1 1
      networking/firewall.nft
  3. 1 1
      networking/upnp.nix
  4. 1 1
      patches/nft.patch

+ 0 - 1
networking/default.nix

@@ -29,7 +29,6 @@
 
         dhcpcd = {
             enable = true;
-            runHook = "systemctl restart nftables.service";
             allowInterfaces = [ "ppp0" ];
             extraConfig = ''
                 # don't touch our DNS settings

+ 1 - 1
networking/firewall.nft

@@ -58,6 +58,6 @@ table ip clash {
 
     chain divert {
         type filter hook prerouting priority mangle; policy accept;
-        ip protocol tcp socket transparent 1 meta mark set 0x233 accept
+        ip protocol tcp socket transparent 1 meta mark set 0x233 counter accept
     }
 }

+ 1 - 1
networking/upnp.nix

@@ -3,7 +3,7 @@
     services.miniupnpd = {
         enable = true;
         natpmp = true;
-        externalInterface = "wan";
+        externalInterface = "ppp0";
         internalIPs = [ "lan" ];
     };
 }

+ 1 - 1
patches/nft.patch

@@ -16,7 +16,7 @@ index 424d005dc0b5ef..357db2c10352a0 100644
      systemd.services.nftables = {
        description = "nftables firewall";
 -      before = [ "network-pre.target" ];
-+      after = [ "network-pre.target" ];
++      after = [ "network.target" ];
        wants = [ "network-pre.target" ];
        wantedBy = [ "multi-user.target" ];
        reloadIfChanged = true;