From 5c284d37601a5829db354314b7ba078d57876a52 Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Tue, 7 Sep 2021 11:22:07 +0200 Subject: [PATCH] plex unstable, add mikey and boogino to wireguard --- hosts/architect/default.nix | 6 ++++++ hosts/architect/network.nix | 2 ++ hosts/architect/plex.nix | 7 +------ hosts/architect/wireguard.nix | 12 ++++++++++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/hosts/architect/default.nix b/hosts/architect/default.nix index 066776a..0871c81 100644 --- a/hosts/architect/default.nix +++ b/hosts/architect/default.nix @@ -28,6 +28,7 @@ in ./plex.nix ./dns.nix ./minecraft.nix + ./plex.nix ]; time.timeZone = "Europe/Rome"; @@ -121,6 +122,10 @@ in ${germano-wg} germano.devs.giugl.io ${dodino-wg} dodino.devs.giugl.io ${tommy-wg} tommy.devs.giugl.io + ${alain-wg} alain.devs.giugl.io + ${dima-wg} dima.devs.giugl.io + ${boogino-wg} boogino.devs.giugl.io + ${mikey-wg} mikey.devs.giugl.io # Blacklist 0.0.0.0 metrics.plex.tv @@ -164,6 +169,7 @@ in zfs.autoScrub.enable = true; xserver.videoDrivers = [ "nvidia" ]; openssh.enable = true; + smartd.enable = true; }; environment.variables = { diff --git a/hosts/architect/network.nix b/hosts/architect/network.nix index 7d3957c..41ad687 100644 --- a/hosts/architect/network.nix +++ b/hosts/architect/network.nix @@ -37,10 +37,12 @@ rec { tommy-wg = "10.3.0.21"; alain-wg = "10.3.0.22"; dima-wg = "10.3.0.23"; + mikey-wg = "10.3.0.24"; eleonora-wg = "10.3.0.100"; broccolino-wg = "10.3.0.200"; hotpottino-wg = "10.3.0.201"; dodino-wg = "10.3.0.202"; + boogino-wg = "10.3.0.203"; # groups gdevices-wg = [ galuminum-wg oneplus-wg ipad-wg gbeast-wg peppiniell-wg padulino-wg angelino-wg ]; diff --git a/hosts/architect/plex.nix b/hosts/architect/plex.nix index 124d033..d4e0356 100644 --- a/hosts/architect/plex.nix +++ b/hosts/architect/plex.nix @@ -14,12 +14,7 @@ with import ./network.nix; forceSSL = true; enableACME = true; http2 = true; - extraConfig = '' - allow 10.0.0.0/24; - allow 10.3.0.0/24; - deny all; - #Some players don't reopen a socket and playback stops totally instead of resuming after an extended pause send_timeout 100m; @@ -76,7 +71,7 @@ with import ./network.nix; proxy_buffering off; ''; locations."/" = { - proxyPass = "http://localhost:32400/"; + proxyPass = "https://localhost:32400"; }; }; }; diff --git a/hosts/architect/wireguard.nix b/hosts/architect/wireguard.nix index 6be1324..35507d2 100644 --- a/hosts/architect/wireguard.nix +++ b/hosts/architect/wireguard.nix @@ -177,6 +177,18 @@ with import ./network.nix; allowedIPs = [dima-wg]; publicKey = "svzWYIZ6v+cLCp/emGG7mx2YpBJqw2fqjVuHZy7b6H0="; } + + { + # boogino + allowedIPs = [boogino-wg]; + publicKey = "p21tD9S04+b+TC27a1CvkJL7V6fcfjOpVU7Ke1FzV3A="; + } + + { + # mikey + allowedIPs = [mikey-wg]; + publicKey = "ewbDdX3z7nxG2aPIf9TogXkhxPlGipLFcy6XfyDC6gI="; + } ]; }; };