High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat: support config via systemd credentials (#20406)
Andrew Marshall4cae15f28da7
diff --git a/docs/docs/install/environment-variables.md b/docs/docs/install/environment-variables.mdindex 939c42439d..d070e3485a 100644--- a/docs/docs/install/environment-variables.md+++ b/docs/docs/install/environment-variables.md@@ -199,12 +199,11 @@ Additional machine learning parameters can be tuned from the admin UI.| `IMMICH_TELEMETRY_INCLUDE` | Collect these telemetries. List of `host`, `api`, `io`, `repo`, `job`. Note: You can also specify `all` to enable all | | server | api, microservices || `IMMICH_TELEMETRY_EXCLUDE` | Do not collect these telemetries. List of `host`, `api`, `io`, `repo`, `job` | | server | api, microservices |-## Docker Secrets+## Secrets-The following variables support the use of [Docker secrets][docker-secrets] for additional security.+The following variables support reading from files, either via [Systemd Credentials][systemd-creds] or [Docker secrets][docker-secrets] for additional security.-To use any of these, replace the regular environment variable with the equivalent `_FILE` environment variable. The value of-the `_FILE` variable should be set to the path of a file containing the variable value.+To use any of these, either set `CREDENTIALS_DIRECTORY` to a directory that contains files whose name is the “regular variable” name, and whose content is the secret. If using Docker Secrets, setting `CREDENTIALS_DIRECTORY=/run/secrets` will cause all secrets present to be used. Alternatively, replace the regular variable with the equivalent `_FILE` environment variable as below. The value of the `_FILE` variable should be set to the path of a file containing the variable value.| Regular Variable | Equivalent Docker Secrets '\_FILE' Variable || :----------------- | :------------------------------------------ |@@ -226,3 +225,4 @@ to use a Docker secret for the password in the Redis container.[docker-secrets-docs]: https://github.com/docker-library/docs/tree/master/postgres#docker-secrets[docker-secrets]: https://docs.docker.com/engine/swarm/secrets/[ioredis]: https://ioredis.readthedocs.io/en/latest/README/#connect-to-redis+[systemd-creds]: https://systemd.io/CREDENTIALS/diff --git a/server/bin/start.sh b/server/bin/start.shindex 2b4351a6bc..10f897dd8e 100755--- a/server/bin/start.sh+++ b/server/bin/start.sh@@ -11,8 +11,12 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jellyfin-ffmpeg/lib"SERVER_HOME=/usr/src/app/serverread_file_and_export() {- if [ -n "${!1}" ]; then- content="$(cat "${!1}")"+ fname="${!1}"+ if [[ -z $fname ]] && [[ -e "$CREDENTIALS_DIRECTORY/$2" ]]; then+ fname="${CREDENTIALS_DIRECTORY}/$2"+ fi+ if [[ -n $fname ]]; then+ content="$(< "$fname")"export "$2"="${content}"unset "$1"fi