diff --git a/keys/hetzner.priv b/keys/hetzner.priv index 3d9659c..810cd19 100644 Binary files a/keys/hetzner.priv and b/keys/hetzner.priv differ diff --git a/keys/macbook.priv b/keys/macbook.priv index c3935a5..b975e7e 100644 Binary files a/keys/macbook.priv and b/keys/macbook.priv differ diff --git a/keys/master.priv b/keys/master.priv index d2ffd90..2207b18 100644 Binary files a/keys/master.priv and b/keys/master.priv differ diff --git a/keys/mullvad b/keys/mullvad index dd2afb3..da57b94 100644 Binary files a/keys/mullvad and b/keys/mullvad differ diff --git a/keys/ren.pub b/keys/ren.pub index 3454ee9..e0d5e02 100644 --- a/keys/ren.pub +++ b/keys/ren.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIM1gLSFZSVq+5s58+pymRJY+QOWHm6SZvvhY93YDm5k ren@me.com +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIsvROeqKXOk3Q7t3vzzCkb8GjMPNgEY0B9tJ8un/RJi ren@me.com diff --git a/keys/wg-macbook b/keys/wg-macbook index d4487b3..fb9c18d 100644 --- a/keys/wg-macbook +++ b/keys/wg-macbook @@ -1,8 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 M7OTMg f7fgG3DiQpjnDRSEUjSinuqgLATaK7QRN59bSimH1EU -9sKf6eQVwqVBrB553zCHwFs0uyQGRpIJkBZ0AyXPFC4 --> ssh-ed25519 CJLJQg +b+cRU3irwvMnqVBWBIV4GoRyEy+Lg3LHUxZ/httTDo -uBlqCHMXyf1Um+W6y1Bh9pY0osqdeTgFQGuR6eSHQP4 ---- Ft1Ii2eVy0h8X6h7ABOW6ryT4ctxg9jS8utA7s52bBA -z0yWϥ4Ͱ^| -MuRtLA:*Ȃh2Sζk咬F& m1y \ No newline at end of file +-> ssh-ed25519 M7OTMg V3VokKEvhyP2M/FQB5W2BJSV8lG1UO6yoXDBiSrcuiI +iiLyzx6lK4kB6ApDpHgn4oNotxt42Yuy34b3lHzZMAU +-> ssh-ed25519 CJLJQg OEjfjJ09mU0JqOVykogVy+i8EecO+xGCMSYtrYFh62Q +DfjPa1Us5t3JfkPqCk1cr91nn3E4205ig02H+5qRtlA +--- zhHrfey7anRttSwkJuMpXrNjA54hP/og7phqOgZ3lEU + K&م,;@+iܣndo_ ahۃ:@ YcsIA@@Sô \ No newline at end of file diff --git a/keys/wg-ren.priv b/keys/wg-ren.priv index e3706a9..79cbc5d 100644 --- a/keys/wg-ren.priv +++ b/keys/wg-ren.priv @@ -1,11 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 M7OTMg 8nknZVXc9jRQ9EIoeZQPfVFc3AsN+ZNaiSPeIWMVNyQ -hjICGDFoRD2hsUOBmdp25kkd0r/VaMCV2qwc32zOHsY --> ssh-ed25519 CJLJQg Z6xiZlQsQ0WrHJL/rfKjqg4UJS6sbToZz+HeYcWdAxQ -Z8On7Lpm5wPj3Trp1tU1nz8G1L19Ko4TmfCOcV9dRqw --> ssh-ed25519 pvX1bw Wwz7stGctuhK51nIvvWJpraC+p1MnctIobNTcfiPoRc -sMd9qVUGTGVZMLNdm4r5qNu/05nxMfibdpdSZ9IFv1g ---- ScMClS6qUPytP3iOk9isrnxfS52ykFVWYfxYoqAxAg4 -pjxC I1~/`Yb޿BkxbED) L{C V/}A֞ -I -Œf#ԭc \ No newline at end of file +-> ssh-ed25519 M7OTMg vPdoXVUWrCjE9WqFO4KnI0hgNcfP+1UwCBsx2uOYv3I +kjeXcmlrNCVd1l0WWbNVg/jwoS1ID3YsuynOG0G6/pk +-> ssh-ed25519 CJLJQg zZNpHGmK/NVAksD8lwnWVwsFgicTb1FgBYyCuIOvDGE +ctiPJ+//4h8NMiEHozOWlWQjhLEkDxnCOSYufnTAdf0 +-> ssh-ed25519 uNZY8Q pmLcWOhEPEcbTnUtaq41JujdBiBeHPeklkYbfZDJUCE +Vd6immLPuL/6AGyxm86VQmRVCONq5j6L528X458aMAw +--- ihQi60DrEXwpBS3Kisa4zMGtEj1ImeGC1GXwKp2LxPU +B޶$K Cdmn~Ic%VA'aAB ZYvߌ&:p \ No newline at end of file diff --git a/keys/wg-selene b/keys/wg-selene index 9c5a200..bf2df59 100644 Binary files a/keys/wg-selene and b/keys/wg-selene differ diff --git a/modules/servermodules/arr/arr.nix b/modules/servermodules/arr/arr.nix index 4b7c807..4e8b4c0 100644 --- a/modules/servermodules/arr/arr.nix +++ b/modules/servermodules/arr/arr.nix @@ -29,11 +29,17 @@ in group = mediaGroup; settings = { incomplete-dir-enabled = true; - incomplete-dir = "/media/torrents/.incomplete"; + download-dir = "/mnt/scratch/torrents"; + incomplete-dir = "/mnt/scratch/torrents/.incomplete"; blocklist-enabled = true; blocklist-url = "https://github.com/Naunter/BT_BlockLists/raw/master/bt_blocklists.gz"; utp-enabled = true; bind-address-ipv4 = "10.64.108.193"; + rpc-port = 3027; + rpc-whitelist-enabled = false; + rpc-whitelist = "192.168.1.*,127.0.0.1,localhost,10.100.0.*"; + rpc-authentication-required = false; + rpc-bind-address = "0.0.0.0"; #Bind to own IP }; }; @@ -45,12 +51,18 @@ in openFirewall = false; }; + services.sonarr = { + enable = true; + group = mediaGroup; + openFirewall = false; + }; + environment.systemPackages = [ pkgs.flood-for-transmission ]; systemd.tmpfiles.rules = [ - "d /media/torrents 0775 torrenter media -" - "d /media/torrents/.incomplete 0775 torrenter media -" + "d /mnt/scratch/torrents 0775 torrenter media -" + "d /mnt/scratch/torrents/.incomplete 0775 torrenter media -" ]; } diff --git a/systems/ren/volumes.nix b/systems/ren/volumes.nix index 9957561..4c3cb3d 100644 --- a/systems/ren/volumes.nix +++ b/systems/ren/volumes.nix @@ -1,6 +1,9 @@ { pkgs, config, ... }: { - environment.systemPackages = [ pkgs.rclone ]; + environment.systemPackages = [ + pkgs.rclone + pkgs.samba + ]; environment.etc."rclone-mnt.conf".text = '' [myremote] type = sftp @@ -20,4 +23,13 @@ "config=/etc/rclone-mnt.conf" ]; }; + + fileSystems."/mnt/scratch" = { + device = "/dev/sdb"; + options = [ + "defaults" + "discard" + "nofail" + ]; + }; }