diff --git a/machines/elendel/default.nix b/machines/elendel/default.nix index 0f7f8191..129b3dbb 100644 --- a/machines/elendel/default.nix +++ b/machines/elendel/default.nix @@ -48,11 +48,20 @@ fast = true; location = "marabethia.vanpetegem.me"; } + { + path = "zdata/safe/data"; + remotePath = "zdata/data"; + fast = false; + location = "socrates.machines.robbevp.be"; + } ]; rootDataset = "zroot/local/root"; rootPool = "zroot"; }; }; - services.git.runner.enable = true; + services = { + git.runner.enable = true; + torrents.enable = true; + }; }; } diff --git a/machines/elendel/hardware.nix b/machines/elendel/hardware.nix index 57bed110..a76b6c8f 100644 --- a/machines/elendel/hardware.nix +++ b/machines/elendel/hardware.nix @@ -63,6 +63,10 @@ device = "zroot/local/services/docker"; fsType = "zfs"; }; + "/var/lib/transmission" = { + device = "zroot/safe/services/transmission"; + fsType = "zfs"; + }; "/var/lib/private/gitea-runner" = { device = "zroot/local/services/gitea-runner"; fsType = "zfs"; diff --git a/machines/urithiru/default.nix b/machines/urithiru/default.nix index e7a426a1..162c83fa 100644 --- a/machines/urithiru/default.nix +++ b/machines/urithiru/default.nix @@ -41,12 +41,6 @@ fast = true; location = "elendel.vanpetegem.me"; } - { - path = "zdata/data"; - remotePath = "zdata/safe/data"; - fast = false; - location = "elendel.vanpetegem.me"; - } ]; rootDataset = "zroot/local/root"; rootPool = "zroot"; @@ -54,14 +48,6 @@ }; services = { accentor.enable = true; - containers.externalInterface = "eno3"; - data-access.enable = true; }; }; - - services.znapzend.zetup."zdata/data".destinations."socrates.machines.robbevp.be" = { - plan = "1day=>1hour,1week=>1day,4week=>1week,1year=>1month,10year=>6month"; - host = "socrates.machines.robbevp.be"; - dataset = "zdata/data"; - }; } diff --git a/modules/nixos/services/torrents/default.nix b/modules/nixos/services/torrents/default.nix index 36ad272c..de5a533c 100644 --- a/modules/nixos/services/torrents/default.nix +++ b/modules/nixos/services/torrents/default.nix @@ -31,7 +31,7 @@ package = pkgs.transmission_4; user = "charlotte"; group = "users"; - home = "/data/var/lib/transmission"; + home = "/var/lib/transmission"; openRPCPort = false; openPeerPorts = true; credentialsFile = config.age.secrets."files/programs/transmission/config.json".path;