1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

diff --git a/gunpowder/services/mullvad.nix b/gunpowder/services/mullvad.nix
index ec0f9e85cf5623e25890c692a6b8365de8899c25..2cf195188d76785514682837325f14c4f362ed88 100644
--- a/gunpowder/services/mullvad.nix
+++ b/gunpowder/services/mullvad.nix
@@ -7,21 +7,22 @@ }:
 let
   enable = true;
 
-  mullvadMark = "0x6d6f6c65";
+  metaMark = "0x6d6f6c65";
+  ctMark = "0x00000f41";
 
   bypassRuleset = pkgs.writeText "mullvad-tailscale-bypass.nft" ''
     table inet mullvad_tailscale_bypass {
       chain output {
         type route hook output priority 0; policy accept;
-        ip daddr 100.64.0.0/10 meta mark set ${mullvadMark} ct mark set ${mullvadMark}
-        ip6 daddr fd7a:115c:a1e0::/48 meta mark set ${mullvadMark} ct mark set ${mullvadMark}
-        oifname "tailscale0" meta mark set ${mullvadMark} ct mark set ${mullvadMark}
+        ip daddr 100.64.0.0/10 meta mark set ${metaMark} ct mark set ${ctMark}
+        ip6 daddr fd7a:115c:a1e0::/48 meta mark set ${metaMark} ct mark set ${ctMark}
+        oifname "tailscale0" meta mark set ${metaMark} ct mark set ${ctMark}
       }
       chain input {
         type filter hook input priority -100; policy accept;
-        ip saddr 100.64.0.0/10 meta mark set ${mullvadMark} ct mark set ${mullvadMark}
-        ip6 saddr fd7a:115c:a1e0::/48 meta mark set ${mullvadMark} ct mark set ${mullvadMark}
-        iifname "tailscale0" meta mark set ${mullvadMark} ct mark set ${mullvadMark}
+        ip saddr 100.64.0.0/10 meta mark set ${metaMark} ct mark set ${ctMark}
+        ip6 saddr fd7a:115c:a1e0::/48 meta mark set ${metaMark} ct mark set ${ctMark}
+        iifname "tailscale0" meta mark set ${metaMark} ct mark set ${ctMark}
       }
     }
   '';

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26

diff --git a/gunpowder/services/qbittorrent.nix b/gunpowder/services/qbittorrent.nix
index 47570926de3738ff3ca9612e0e04036622afbab6..a14e7f0610b088286e9500010ce44ed9b162cc8a 100644
--- a/gunpowder/services/qbittorrent.nix
+++ b/gunpowder/services/qbittorrent.nix
@@ -1,6 +1,7 @@
 { lib, pkgs, ... }:
 let
   enable = true;
+  port = 7248;
 
   killSwitchRuleset = pkgs.writeText "qbittorrent-mullvad-only.nft" ''
     table inet qbittorrent_mullvad_only {
@@ -16,11 +17,12 @@   services = {
     qbittorrent = {
       enable = true;
       openFirewall = true;
+      webuiPort = port;
     };
     tailproxy.qbittorrent = {
       enable = true;
       hostname = "qbittorrent";
-      port = 8080;
+      inherit port;
       authKey = "tskey-auth-kV7j5FHHHh11CNTRL-wPSNdNQqza8kXxzpnZXha8B7JCvdwCAy"; # One-time key
     };
   };