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

strip whitespaces when loading secrets

Browse Source
This commit is contained in:
thorpejosh 2024-07-11 21:55:18 +08:00
parent 4ee8557061
commit 8309804bd3
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ if os.path.isdir("/run/secrets"):
if secret_file.startswith("FRIGATE_"): if secret_file.startswith("FRIGATE_"):
FRIGATE_ENV_VARS[secret_file] = Path( FRIGATE_ENV_VARS[secret_file] = Path(
os.path.join("/run/secrets", secret_file) os.path.join("/run/secrets", secret_file)
).read_text() ).read_text().strip()
config_file = os.environ.get("CONFIG_FILE", "/config/config.yml") config_file = os.environ.get("CONFIG_FILE", "/config/config.yml")

2
frigate/api/auth.py
View File

@ -89,7 +89,7 @@ def get_jwt_secret() -> str:
# check docker secrets # check docker secrets
elif os.path.isfile(os.path.join("/run/secrets", JWT_SECRET_ENV_VAR)): elif os.path.isfile(os.path.join("/run/secrets", JWT_SECRET_ENV_VAR)):
logger.debug(f"Using jwt secret from {JWT_SECRET_ENV_VAR} docker secret file.") logger.debug(f"Using jwt secret from {JWT_SECRET_ENV_VAR} docker secret file.")
jwt_secret = Path(os.path.join("/run/secrets", JWT_SECRET_ENV_VAR)).read_text() jwt_secret = Path(os.path.join("/run/secrets", JWT_SECRET_ENV_VAR)).read_text().strip()
# check for the addon options file # check for the addon options file
elif os.path.isfile("/data/options.json"): elif os.path.isfile("/data/options.json"):
with open("/data/options.json") as f: with open("/data/options.json") as f:

2
frigate/config.py
View File

@ -64,7 +64,7 @@ if os.path.isdir("/run/secrets") and os.access("/run/secrets", os.R_OK):
if secret_file.startswith("FRIGATE_"): if secret_file.startswith("FRIGATE_"):
FRIGATE_ENV_VARS[secret_file] = Path( FRIGATE_ENV_VARS[secret_file] = Path(
os.path.join("/run/secrets", secret_file) os.path.join("/run/secrets", secret_file)
).read_text() ).read_text().strip()
DEFAULT_TRACKED_OBJECTS = ["person"] DEFAULT_TRACKED_OBJECTS = ["person"]
DEFAULT_ALERT_OBJECTS = ["person", "car"] DEFAULT_ALERT_OBJECTS = ["person", "car"]

2
frigate/plus.py
View File

@ -42,7 +42,7 @@ class PlusApi:
and os.access("/run/secrets", os.R_OK) and os.access("/run/secrets", os.R_OK)
and PLUS_ENV_VAR in os.listdir("/run/secrets") and PLUS_ENV_VAR in os.listdir("/run/secrets")
): ):
self.key = Path(os.path.join("/run/secrets", PLUS_ENV_VAR)).read_text() self.key = Path(os.path.join("/run/secrets", PLUS_ENV_VAR)).read_text().strip()
# check for the addon options file # check for the addon options file
elif os.path.isfile("/data/options.json"): elif os.path.isfile("/data/options.json"):
with open("/data/options.json") as f: with open("/data/options.json") as f: