administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-10-03 13:26:48 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

tolerate homekit config chown failures in the go2rtc run script

Browse Source
This commit is contained in:
Josh Hawkins
2026-08-28 07:28:47 -05:00
parent 5ad578b870
commit 14b8b13514
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run
+5 -3
View File
@@ -113,9 +113,11 @@ setup_homekit_config "${homekit_config_path}"
if [[ "$(id -u)" -eq 0 && "${FRIGATE_RUN_AS_ROOT:-false}" != "true" ]]; then if [[ "$(id -u)" -eq 0 && "${FRIGATE_RUN_AS_ROOT:-false}" != "true" ]]; then
chown go2rtc:go2rtc /dev/shm/go2rtc.yaml 2>/dev/null || true chown go2rtc:go2rtc /dev/shm/go2rtc.yaml 2>/dev/null || true
# go2rtc rewrites this in place (os.WriteFile, no rename), so owning the # go2rtc rewrites this in place (os.WriteFile, no rename), so owning the
# file is enough; /config grants frigate-data traverse only # file is enough; /config grants frigate-data traverse only. Tolerated so
chown go2rtc:frigate-data "${homekit_config_path}" # a chown-refusing mount (NFS root_squash) degrades pairing persistence
chmod 664 "${homekit_config_path}" # instead of crash-looping the service
chown go2rtc:frigate-data "${homekit_config_path}" 2>/dev/null && chmod 664 "${homekit_config_path}" 2>/dev/null || \
echo "[WARN] Could not hand ${homekit_config_path} to the go2rtc user; HomeKit pairing changes may not persist"
fi fi
readonly config_path="/config" readonly config_path="/config"
docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run
+1 -1
View File
@@ -100,7 +100,7 @@ echo "$nginx_settings" | \
if [[ "$(id -u)" -eq 0 && "${FRIGATE_RUN_AS_ROOT:-false}" != "true" ]]; then if [[ "$(id -u)" -eq 0 && "${FRIGATE_RUN_AS_ROOT:-false}" != "true" ]]; then
chown -R frigate:frigate /tmp/nginx chown -R frigate:frigate /tmp/nginx
# only the self-signed key we just generated; user-mounted certs may be :ro # self-signed certs are root-generated; tolerant because mounted certs may be :ro
if [ -f "$letsencrypt_path/privkey.pem" ]; then if [ -f "$letsencrypt_path/privkey.pem" ]; then
chown frigate:frigate "$letsencrypt_path/privkey.pem" "$letsencrypt_path/fullchain.pem" 2>/dev/null || true chown frigate:frigate "$letsencrypt_path/privkey.pem" "$letsencrypt_path/fullchain.pem" 2>/dev/null || true
fi fi