From f56b6010ffb85f5fb052b0e8373d6d6bfc0bc2e7 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 27 Feb 2024 04:33:09 -0500
Subject: [PATCH] fix(qbit): misc fixes

---
 devices/cluster/modules/caddy.nix             |  2 +-
 devices/nas/modules/mergerfs.nix              | 21 +++++++++++--------
 .../nas/modules/qbittorrent/qbittorrent.nix   |  1 +
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/devices/cluster/modules/caddy.nix b/devices/cluster/modules/caddy.nix
index 183e63f..0385608 100644
--- a/devices/cluster/modules/caddy.nix
+++ b/devices/cluster/modules/caddy.nix
@@ -134,7 +134,7 @@ in {
               qbittorent = {
                 subDirName = "qbt";
                 experimental = true;
-                reverseProxy = "10.0.0.128:8080";
+                reverseProxy = "${servivi}:8080";
               };
 
               vaultwarden = {
diff --git a/devices/nas/modules/mergerfs.nix b/devices/nas/modules/mergerfs.nix
index a02cdd1..1327bf7 100644
--- a/devices/nas/modules/mergerfs.nix
+++ b/devices/nas/modules/mergerfs.nix
@@ -20,6 +20,9 @@
     "defaults"
   ];
 in {
+  # For sshfs permissions
+  programs.fuse.userAllowOther = true;
+
   programs.ssh.knownHosts = {
     "10.0.0.121".publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDs4eTQxAU+/B3B3AYXbTeRIZGk6lUKlykWrZZ07r3NMIJkleEE7i5KgW8QeeWVLFG8Thi4jyVferM7tPILA//Q6GXNDQ3ioYHExG33d/yIRGStD3rEizAv0LkDHavZ33VDNEOkBLQ22eeB7cCaQvsUoCbryo6w3mSQO5PDH9RE44XrOaSCbLvjhst5Z9gXPtrJsBcvOFUpdwz5gIHIqTFo6fQpmzxYkY5GrMaqMB75Xh2MQNkIZteC2MMPgIH9Vz+Q3CnzyiXEzoYaUtT0//sXnydagWWt9xf+KJ34Oz0r1Jtn2ihgJZmA7NrO5zATZVq6qQHdhry3xL1PpvY7U5Zx";
   };
@@ -45,7 +48,7 @@ in {
       mountPoint = "/mnt/drives/3tb1";
       fsType = "sshfs"; # "ext4";
       options = sshfsOpts;
-      device = "root@10.0.0.121:/drives/3tb-1";
+      device = "matt@10.0.0.121:/drives/3tb-1";
       # device = "/dev/disk/by-id/ata-WDC_WD30EFRX-68EUZN0_WD-WMC4N1236473-part1";
     };
 
@@ -53,7 +56,7 @@ in {
       mountPoint = "/mnt/drives/3tb2";
       fsType = "sshfs"; # "ext4";
       options = sshfsOpts;
-      device = "root@10.0.0.121:/drives/3tb-2";
+      device = "matt@10.0.0.121:/drives/3tb-2";
       # device = "/dev/disk/by-id/ata-WDC_WD30EFRX-68EUZN0_WD-WMC4N1233153-part1";
     };
 
@@ -61,7 +64,7 @@ in {
       mountPoint = "/mnt/drives/4tb1";
       fsType = "sshfs"; # "ext4";
       options = sshfsOpts;
-      device = "root@10.0.0.121:/drives/4tb-1";
+      device = "matt@10.0.0.121:/drives/4tb-1";
       # device = "/dev/disk/by-id/ata-WDC_WD40EZAZ-19SF3B0_WD-WX32D81DE8RD-part1";
     };
 
@@ -69,7 +72,7 @@ in {
       mountPoint = "/mnt/drives/4tb2";
       fsType = "sshfs"; # "ext4";
       options = sshfsOpts;
-      device = "root@10.0.0.121:/drives/4tb-2";
+      device = "matt@10.0.0.121:/drives/4tb-2";
       # device = "/dev/disk/by-id/ata-WDC_WD40EZAZ-19SF3B0_WD-WX32D81DE6Z0-part1";
     };
 
@@ -77,7 +80,7 @@ in {
       mountPoint = "/mnt/drives/8tb1";
       fsType = "sshfs"; # "ext4";
       options = sshfsOpts;
-      device = "root@10.0.0.121:/drives/8tb-1";
+      device = "matt@10.0.0.121:/drives/8tb-1";
       # device = "/dev/disk/by-id/ata-WDC_WD8003FFBX-68B9AN0_VAJ99UDL-part1";
     };
 
@@ -85,7 +88,7 @@ in {
       mountPoint = "/mnt/drives/parity0";
       fsType = "sshfs"; # "ext4";
       options = sshfsOpts;
-      device = "root@10.0.0.121:/drives/parity0";
+      device = "matt@10.0.0.121:/drives/parity0";
       # device = "/dev/disk/by-id/ata-WDC_WD8003FFBX-68B9AN0_VDGL4HZD-part1";
     };
 
@@ -93,7 +96,7 @@ in {
       mountPoint = "/mnt/drives/parity1";
       fsType = "sshfs"; # "ext4";
       options = sshfsOpts;
-      device = "root@10.0.0.121:/drives/parity1";
+      device = "matt@10.0.0.121:/drives/parity1";
       # device = "/dev/disk/by-id/ata-WDC_WD80EFZZ-68BTXN0_WD-CA13WUYK-part1";
     };
 
@@ -101,7 +104,7 @@ in {
       mountPoint = "/mnt/drives/8tb4";
       fsType = "sshfs"; # "ext4";
       options = sshfsOpts;
-      device = "root@10.0.0.121:/drives/8tb-4";
+      device = "matt@10.0.0.121:/drives/8tb-4";
       # device = "/dev/disk/by-id/ata-WDC_WD80EAZZ-00BKLB0_WD-CA1AVU7K-part1";
     };
 
@@ -109,7 +112,7 @@ in {
       mountPoint = "/mnt/drives/8tb5";
       fsType = "sshfs"; # "ext4";
       options = sshfsOpts;
-      device = "root@10.0.0.121:/drives/8tb-5";
+      device = "matt@10.0.0.121:/drives/8tb-5";
       # device = "/dev/disk/by-id/ata-WDC_WD80EAZZ-00BKLB0_WD-CA1GN0GK-part1";
     };
   };
diff --git a/devices/nas/modules/qbittorrent/qbittorrent.nix b/devices/nas/modules/qbittorrent/qbittorrent.nix
index 6ea5c6c..1d2d1b1 100644
--- a/devices/nas/modules/qbittorrent/qbittorrent.nix
+++ b/devices/nas/modules/qbittorrent/qbittorrent.nix
@@ -102,6 +102,7 @@ in {
       wantedBy = ["multi-user.target"];
       path = [pkg];
       script = ''
+        rm -rf ${cfg.configDir}/vuetorrent
         ln -sf ${vue} ${cfg.configDir}/vuetorrent
         qbittorrent-nox \
           --profile=${cfg.configDir} \