Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-10-27 10:52:11 +01:00
Code Issues Projects Releases Wiki Activity

Fix HA IP address and WebRTC port inferring (#5209)

Browse Source 
* Fix HA IP address and WebRTC port inferring

* Add note for when candidates aren't being injected
This commit is contained in:
Felipe Santos 2023-01-24 10:26:16 -03:00 committed by GitHub
parent edbdbb7f07
commit 2f3e046130
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run
View File

@ -10,7 +10,7 @@ s6-svc -O .
function get_ip_and_port_from_supervisor() {
local ip_address
# Example: 192.168.1.10/24
local ip_regex='^([0-9]{1,3}\.{3}[0-9]{1,3})/[0-9]{1,2}$'
local ip_regex='^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})/[0-9]{1,2}$'
if ip_address=$(
curl -fsSL \
-H "Authorization: Bearer ${SUPERVISOR_TOKEN}" \
@ -32,7 +32,7 @@ function get_ip_and_port_from_supervisor() {
-H "Authorization: Bearer ${SUPERVISOR_TOKEN}" \
-H "Content-Type: application/json" \
http://supervisor/addons/self/info |
jq --exit-status --raw-output '.data.network["22/tcp"]'
jq --exit-status --raw-output '.data.network["8555/tcp"]'
) && [[ "${webrtc_port}" =~ ${port_regex} ]]; then
webrtc_port="${BASH_REMATCH[1]}"
echo "[INFO] Got WebRTC port from supervisor: ${ip_address}" >&2

2
docker/rootfs/usr/local/go2rtc/create_config.py
View File

@ -40,6 +40,8 @@ if not go2rtc_config.get("webrtc", {}).get("candidates", []):
default_candidates.append("stun:8555")
go2rtc_config["webrtc"] = {"candidates": default_candidates}
else:
print("[INFO] Not injecting WebRTC candidates into go2rtc config as it has been set manually")
# need to replace ffmpeg command when using ffmpeg4
if not os.path.exists(BTBN_PATH):