diff --git a/modules/home/programs/terminal/ssh/default.nix b/modules/home/programs/terminal/ssh/default.nix index bb0580a4..ca73dbf3 100644 --- a/modules/home/programs/terminal/ssh/default.nix +++ b/modules/home/programs/terminal/ssh/default.nix @@ -7,6 +7,7 @@ matchBlocks = { # Personal servers tower.hostname = "4e4:535:9d47:f367:becd:6557:458d:5b1b"; + intuos.hostname = "40e:404:a427:da33:163e:97b3:a2a3:9ed4"; jupiter.hostname = "5ce:969c:40d1:9575:f5e:591d:c377:a20b"; midas.hostname = "538:e163:87ba:f847:3646:18b6:6b01:d8f8"; kitty.hostname = "53f:dc2d:80c9:3ca2:4b15:ef4d:38a0:c868"; diff --git a/modules/system/devices/networking/mycelium/ips/default.nix b/modules/system/devices/networking/mycelium/ips/default.nix index 456e6577..46cfc01c 100644 --- a/modules/system/devices/networking/mycelium/ips/default.nix +++ b/modules/system/devices/networking/mycelium/ips/default.nix @@ -6,6 +6,7 @@ config.services.mycelium.ips = { tower = "4e4:535:9d47:f367:becd:6557:458d:5b1b"; + intuos = "40e:404:a427:da33:163e:97b3:a2a3:9ed4"; jupiter = "5ce:969c:40d1:9575:f5e:591d:c377:a20b"; midas = "538:e163:87ba:f847:3646:18b6:6b01:d8f8"; kitty = "53f:dc2d:80c9:3ca2:4b15:ef4d:38a0:c868"; diff --git a/modules/system/services/server/nfs/default.nix b/modules/system/services/server/nfs/default.nix index c71175c1..82dc43ba 100644 --- a/modules/system/services/server/nfs/default.nix +++ b/modules/system/services/server/nfs/default.nix @@ -5,7 +5,7 @@ config = lib.mkIf config.services.nfs.server.enable { services.nfs.server.exports = "/storage *(rw)"; networking.firewall.extraInputRules = with config.services.mycelium.ips; '' - ip6 saddr { ${tower}, ${jupiter}, ${midas}, ${kitty}, ${prophet} } tcp dport 2049 accept + ip6 saddr { ${tower}, ${intuos}, ${jupiter}, ${midas}, ${kitty}, ${prophet} } tcp dport 2049 accept ''; }; } diff --git a/modules/system/services/server/nginx/rtmp/default.nix b/modules/system/services/server/nginx/rtmp/default.nix index ca389beb..a52c1397 100644 --- a/modules/system/services/server/nginx/rtmp/default.nix +++ b/modules/system/services/server/nginx/rtmp/default.nix @@ -24,7 +24,7 @@ ''; }; networking.firewall.extraInputRules = with config.services.mycelium.ips; '' - ip6 saddr { ${tower}, ${jupiter} } tcp dport 1935 accept + ip6 saddr { ${tower}, ${intuos}, ${jupiter} } tcp dport 1935 accept ip saddr { ${config.secrets.ips.luna}, ${config.secrets.ips.corn} } tcp dport 1935 accept ''; systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www/landing-page/streams/hls/" ]; diff --git a/modules/system/services/server/owncast/default.nix b/modules/system/services/server/owncast/default.nix index 4696fe89..acc81c55 100644 --- a/modules/system/services/server/owncast/default.nix +++ b/modules/system/services/server/owncast/default.nix @@ -8,7 +8,7 @@ rtmp-port = 1945; }; networking.firewall.extraInputRules = with config.services.mycelium.ips; '' - ip6 saddr { ${tower}, ${jupiter} } tcp dport 1935 accept + ip6 saddr { ${tower}, ${intuos}, ${jupiter} } tcp dport 1935 accept ''; environment.persistence."/persist".directories = [ "/var/lib/owncast" ]; };