From fa3f14785cf8b8b4018f419a406973f20a0db874 Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Sat, 29 Mar 2025 11:10:17 -0400 Subject: [PATCH] removed torrenting pool --- .vscode/settings.json | 1 - systems/jeeves/default.nix | 1 - systems/jeeves/docker/qbitvpn.nix | 2 +- systems/jeeves/hardware.nix | 15 +++++---------- systems/jeeves/scripts/zfs.sh | 8 ++------ systems/jeeves/services/transmission.nix | 4 ++-- systems/jeeves/services/validate_system.toml | 2 +- systems/jeeves/vars.nix | 10 ++++------ 8 files changed, 15 insertions(+), 28 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index e4fea77..3cd0f25 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -268,7 +268,6 @@ "Tmpfs", "topsites", "topstories", - "torrenting", "treefmt", "twimg", "uaccess", diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix index 2302dbf..32bd3fe 100644 --- a/systems/jeeves/default.nix +++ b/systems/jeeves/default.nix @@ -19,7 +19,6 @@ boot.zfs.extraPools = [ "media" "storage" - "torrenting" ]; powerManagement = { diff --git a/systems/jeeves/docker/qbitvpn.nix b/systems/jeeves/docker/qbitvpn.nix index a02c906..29b79fe 100644 --- a/systems/jeeves/docker/qbitvpn.nix +++ b/systems/jeeves/docker/qbitvpn.nix @@ -22,7 +22,7 @@ in ]; volumes = [ "${vars.media_docker_configs}/qbitvpn:/config" - "${vars.torrenting_qbitvpn}:/data" + "${vars.storage_qbitvpn}:/data" "/etc/localtime:/etc/localtime:ro" ]; environment = { diff --git a/systems/jeeves/hardware.nix b/systems/jeeves/hardware.nix index 9427d45..d6baf8f 100644 --- a/systems/jeeves/hardware.nix +++ b/systems/jeeves/hardware.nix @@ -110,16 +110,11 @@ "luks-storage_pool-wwn-0x5000cca23bd00ae9-part1".device = "/dev/disk/by-id/wwn-0x5000cca23bd00ae9-part1"; # Torrenting pool - "luks-torrenting_pool-wwn-0x500a0751e6c3c01e-part1" = { - device = "/dev/disk/by-id/wwn-0x500a0751e6c3c01e-part1"; - bypassWorkqueues = true; - allowDiscards = true; - }; - "luks-torrenting_pool-wwn-0x5000cca264f080a3-part1".device = - "/dev/disk/by-id/wwn-0x5000cca264f080a3-part1"; - "luks-torrenting_pool-wwn-0x5000cca298c33ae5-part1".device = - "/dev/disk/by-id/wwn-0x5000cca298c33ae5-part1"; - # cspell:enable + # "luks-torrenting_pool-wwn-0x500a0751e6c3c01e-part1" = { + # device = "/dev/disk/by-id/wwn-0x500a0751e6c3c01e-part1"; + # bypassWorkqueues = true; + # allowDiscards = true; + # }; }; }; kernelModules = [ "kvm-amd" ]; diff --git a/systems/jeeves/scripts/zfs.sh b/systems/jeeves/scripts/zfs.sh index f72a69b..b1f4353 100644 --- a/systems/jeeves/scripts/zfs.sh +++ b/systems/jeeves/scripts/zfs.sh @@ -11,9 +11,6 @@ sudo zpool create -o ashift=12 -O acltype=posixacl -O atime=off -O dnodesize=aut sudo zpool add storage -o ashift=12 special mirror sudo zpool add storage -o ashift=12 logs mirror -# torrenting -sudo zpool create -o ashift=12 -O acltype=posixacl -O atime=off -O dnodesize=auto -O xattr=sa -O compression=zstd -m /zfs/torrenting torrenting -sudo zpool add torrenting -o ashift=12 special # media datasets sudo zfs create -o compression=zstd-9 media/docker @@ -33,7 +30,6 @@ sudo zfs create -o recordsize=16K -o compression=zstd-19 -o copies=2 storage/pho sudo zfs create -o recordsize=1M -o compression=zstd-19 storage/plex sudo zfs create -o compression=zstd-19 -o copies=3 storage/secrets sudo zfs create -o compression=zstd-19 storage/syncthing +sudo zfs create -o recordsize=1M -o compression=zstd-9 -o exec=off -o sync=disabled storage/qbitvpn +sudo zfs create -o recordsize=1M -o compression=zstd-9 -o exec=off -o sync=disabled storage/transmission -# torrenting datasets -sudo zfs create -o recordsize=16K -o exec=off -o sync=disabled torrenting/qbit -sudo zfs create -o recordsize=16K -o exec=off -o sync=disabled torrenting/qbitvpn diff --git a/systems/jeeves/services/transmission.nix b/systems/jeeves/services/transmission.nix index fa8231b..23bc605 100644 --- a/systems/jeeves/services/transmission.nix +++ b/systems/jeeves/services/transmission.nix @@ -14,9 +14,9 @@ in settings = { bind-address-ipv4 = "192.168.95.14"; cache-size-mb = 0; - download-dir = "${vars.torrenting_transmission}/complete"; + download-dir = "${vars.storage_transmission}/complete"; download-queue-enabled = false; - incomplete-dir = "${vars.torrenting_transmission}/incomplete"; + incomplete-dir = "${vars.storage_transmission}/incomplete"; incomplete-dir-enabled = true; message-level = 3; peer-port = 51413; diff --git a/systems/jeeves/services/validate_system.toml b/systems/jeeves/services/validate_system.toml index 299a3cd..a0ce484 100644 --- a/systems/jeeves/services/validate_system.toml +++ b/systems/jeeves/services/validate_system.toml @@ -1,4 +1,4 @@ -zpool = ["root_pool", "storage", "torrenting", "media"] +zpool = ["root_pool", "storage", "media"] services = [ "audiobookshelf", "cloud_flare_tunnel", diff --git a/systems/jeeves/vars.nix b/systems/jeeves/vars.nix index 1cfbe16..0c7642d 100644 --- a/systems/jeeves/vars.nix +++ b/systems/jeeves/vars.nix @@ -1,10 +1,9 @@ let zfs_media = "/zfs/media"; zfs_storage = "/zfs/storage"; - zfs_torrenting = "/zfs/torrenting"; in { - inherit zfs_media zfs_storage zfs_torrenting; + inherit zfs_media zfs_storage; # media media_database = "${zfs_media}/database"; media_docker = "${zfs_media}/docker"; @@ -22,8 +21,7 @@ in storage_secrets = "${zfs_storage}/secrets"; storage_syncthing = "${zfs_storage}/syncthing"; storage_library = "${zfs_storage}/library"; - # torrenting - torrenting_qbit = "${zfs_torrenting}/qbit"; - torrenting_qbitvpn = "${zfs_torrenting}/qbitvpn"; - torrenting_transmission = "${zfs_torrenting}/transmission"; + storage_qbitvpn = "${zfs_storage}/qbitvpn"; + storage_transmission = "${zfs_storage}/transmission"; + }