diff --git a/src/system/machines/server/system.nix b/src/system/machines/server/system.nix index a35fbd3..fc30148 100644 --- a/src/system/machines/server/system.nix +++ b/src/system/machines/server/system.nix @@ -125,9 +125,11 @@ # Block specific camera MACs from forwarding (instant DROP, no timeouts) # Add each camera MAC here as you set them up iptables -A FORWARD -m mac --mac-source 00:1f:54:c2:d1:b1 -j DROP # parking_lot + iptables -A FORWARD -m mac --mac-source 00:1f:54:b2:9b:1d -j DROP # living_room/kitchen ''; extraStopCommands = '' iptables -D FORWARD -m mac --mac-source 00:1f:54:c2:d1:b1 -j DROP || true + iptables -D FORWARD -m mac --mac-source 00:1f:54:b2:9b:1d -j DROP || true ''; }; }; @@ -156,6 +158,7 @@ # Static DHCP reservations for cameras dhcp-host = [ "00:1f:54:c2:d1:b1,192.168.1.194,parking_lot" + "00:1f:54:b2:9b:1d,192.168.1.147,living_room_kitchen" ]; }; }; diff --git a/src/system/modules/frigate/README.md b/src/system/modules/frigate/README.md index 24cb6fa..3e2ac53 100644 --- a/src/system/modules/frigate/README.md +++ b/src/system/modules/frigate/README.md @@ -5,9 +5,9 @@ | Camera | Model | MAC | IP | |--------|-------|-----|-----| | parking_lot | W461ASC | 00:1f:54:c2:d1:b1 | 192.168.1.194 | -| doorbell | B463AJ | | | | -| living_room | W463AQ | | | | -| kitchen | W463AQ | | | | +| doorbell | B463AJ | | | +| living_room | W463AQ (ch1) | 00:1f:54:b2:9b:1d | 192.168.1.147 | +| kitchen | W463AQ (ch2) | 00:1f:54:b2:9b:1d | 192.168.1.147 | | porch | SL300 | | | | ## Network Architecture diff --git a/src/system/modules/frigate/default.nix b/src/system/modules/frigate/default.nix index 1462283..ca3be7f 100644 --- a/src/system/modules/frigate/default.nix +++ b/src/system/modules/frigate/default.nix @@ -30,18 +30,18 @@ in }]; }; living_room = { - enabled = false; + enabled = true; detect.enabled = false; ffmpeg.inputs = [{ - path = "rtsp://admin:ocu?u3Su@192.168.0.181/cam/realmonitor?channel=1&subtype=0"; + path = "rtsp://admin:ocu?u3Su@192.168.1.147/cam/realmonitor?channel=1&subtype=0"; roles = [ "record" ]; }]; }; kitchen = { - enabled = false; + enabled = true; detect.enabled = false; ffmpeg.inputs = [{ - path = "rtsp://admin:ocu?u3Su@192.168.0.181/cam/realmonitor?channel=2&subtype=0"; + path = "rtsp://admin:ocu?u3Su@192.168.1.147/cam/realmonitor?channel=2&subtype=0"; roles = [ "record" ]; }]; };