administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-03 17:55:21 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix substitute condition & docs

Browse Source
This commit is contained in:
Pierre Belanger 2023-01-07 16:58:11 -05:00
parent 6c2e2d7b6d
commit 072c851956
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/docs/configuration/index.md
View File

@ -52,10 +52,9 @@ mqtt:
# NOTE: must be unique if you are running multiple instances # NOTE: must be unique if you are running multiple instances
client_id: frigate client_id: frigate
# Optional: user # Optional: user
user: mqtt_user
# NOTE: MQTT user can be specified with an environment variables that must begin with 'FRIGATE_'. # NOTE: MQTT user can be specified with an environment variables that must begin with 'FRIGATE_'.
# e.g. user: '{FRIGATE_MQTT_USER}' # e.g. user: '{FRIGATE_MQTT_USER}'
password: password user: mqtt_user
# Optional: password # Optional: password
# NOTE: MQTT password can be specified with an environment variables that must begin with 'FRIGATE_'. # NOTE: MQTT password can be specified with an environment variables that must begin with 'FRIGATE_'.
# e.g. password: '{FRIGATE_MQTT_PASSWORD}' # e.g. password: '{FRIGATE_MQTT_PASSWORD}'

8
frigate/config.py
View File

@ -863,12 +863,10 @@ class FrigateConfig(FrigateBaseModel):
"""Merge camera config with globals.""" """Merge camera config with globals."""
config = self.copy(deep=True) config = self.copy(deep=True)
# MQTT password substitution # MQTT user/password substitutions
if config.mqtt.password: if config.mqtt.user or config.mqtt.password:
config.mqtt.password = config.mqtt.password.format(**FRIGATE_ENV_VARS)
# MQTT user substitution
if config.mqtt.user:
config.mqtt.user = config.mqtt.user.format(**FRIGATE_ENV_VARS) config.mqtt.user = config.mqtt.user.format(**FRIGATE_ENV_VARS)
config.mqtt.password = config.mqtt.password.format(**FRIGATE_ENV_VARS)
# Global config to propagate down to camera level # Global config to propagate down to camera level
global_config = config.dict( global_config = config.dict(