From 65247f40d4d639868ce1a82fc8937f161f96e59b Mon Sep 17 00:00:00 2001 From: BhasherBEL Date: Tue, 10 Sep 2024 14:23:43 +0200 Subject: [PATCH] Update --- bxl-shp/apps/docker-compose.immich.yaml.old | 66 +++++++++++++++++++ bxl-shp/apps/docker-compose.paperless.yaml | 3 +- ...=> docker-compose.photostructure.yaml.old} | 2 +- .../config/idp/authelia.configuration.yaml | 17 +++++ 4 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 bxl-shp/apps/docker-compose.immich.yaml.old rename bxl-shp/apps/{docker-compose.photostructure.yaml => docker-compose.photostructure.yaml.old} (92%) diff --git a/bxl-shp/apps/docker-compose.immich.yaml.old b/bxl-shp/apps/docker-compose.immich.yaml.old new file mode 100644 index 0000000..3eeb955 --- /dev/null +++ b/bxl-shp/apps/docker-compose.immich.yaml.old @@ -0,0 +1,66 @@ +services: + immich-server: + container_name: immich-server + image: ghcr.io/immich-app/immich-server:v1.112.1 + restart: unless-stopped + depends_on: + - traefik + stop_grace_period: 2m + volumes: + - /mnt/sync/immich:/usr/src/app/upload + - /mnt/sync/photostructure/library:/mnt/photostructure:ro + - /etc/localtime:/etc/localtime:ro + environment: + - TZ=Europe/Paris + - DB_HOSTNAME=immich-db + - DB_USERNAME=postgres + - DB_PASSWORD=${POSTGRES_PASSWORD} + - DB_DATABASE_NAME=immich + labels: + - "traefik.enable=true" + - "traefik.http.routers.immich.rule=Host(`photos.bhasher.com`)" + - "traefik.http.routers.immich.entrypoints=internalsecure" + - "traefik.http.services.immich.loadbalancer.server.port=3001" + - "traefik.http.routers.immich.tls=true" + - "traefik.http.routers.immich.tls.certresolver=http" + - "com.centurylinklabs.watchtower.enable=true" + networks: + - external + - immich + - storage + + immich-ml: + container_name: immich-ml + image: ghcr.io/immich-app/immich-machine-learning:v1.112.1 + volumes: + - $DATA/immich/ml-cache:/cache + environment: + - TZ=Europe/Paris + - DB_USERNAME=postgres + - DB_PASSWORD=${POSTGRES_PASSWORD} + - DB_DATABASE_NAME=immich + networks: + - immich + + immich-db: + container_name: immich-db + image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0 + environment: + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_USER=postgres + - POSTGRES_DB=immich + - POSTGRES_INITDB_ARGS='--data-checksums' + volumes: + - $DATA/immich/db:/var/lib/postgresql/data + healthcheck: + test: pg_isready --dbname='immich' --username='postgres' || exit 1; Chksum="$$(psql --dbname='immich' --username='postgres' --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1 + interval: 5m + start_interval: 30s + start_period: 5m + command: ["postgres", "-c", "shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"] + restart: always + networks: + - immich + +networks: + immich: diff --git a/bxl-shp/apps/docker-compose.paperless.yaml b/bxl-shp/apps/docker-compose.paperless.yaml index 343280e..e6ed562 100644 --- a/bxl-shp/apps/docker-compose.paperless.yaml +++ b/bxl-shp/apps/docker-compose.paperless.yaml @@ -16,6 +16,7 @@ services: - PAPERLESS_REDIS=redis://redis:6379 - PAPERLESS_DBENGINE=postgresql - PAPERLESS_DBHOST=postgres + - PAPERLESS_DBPORT=5432 - PAPERLESS_DBNAME=paperless - PAPERLESS_DBUSER=postgres - PAPERLESS_DBPASS=${POSTGRES_PASSWORD} @@ -38,6 +39,6 @@ services: - "traefik.http.routers.paperless.tls=true" - "traefik.http.routers.paperless.tls.certresolver=http" networks: - - auth + #- auth - storage - external diff --git a/bxl-shp/apps/docker-compose.photostructure.yaml b/bxl-shp/apps/docker-compose.photostructure.yaml.old similarity index 92% rename from bxl-shp/apps/docker-compose.photostructure.yaml rename to bxl-shp/apps/docker-compose.photostructure.yaml.old index 14cba35..f341806 100644 --- a/bxl-shp/apps/docker-compose.photostructure.yaml +++ b/bxl-shp/apps/docker-compose.photostructure.yaml.old @@ -25,7 +25,7 @@ services: - PGID=1000 labels: - "traefik.enable=true" - - "traefik.http.routers.photostructure.rule=Host(`photos.bhasher.com`)" + - "traefik.http.routers.photostructure.rule=Host(`old-photos.bhasher.com`)" - "traefik.http.routers.photostructure.entrypoints=internalsecure" - "traefik.http.services.photostructure.loadbalancer.server.port=1787" - "traefik.http.routers.photostructure.tls=true" diff --git a/bxl-shp/config/idp/authelia.configuration.yaml b/bxl-shp/config/idp/authelia.configuration.yaml index ae0bfb2..d7da767 100644 --- a/bxl-shp/config/idp/authelia.configuration.yaml +++ b/bxl-shp/config/idp/authelia.configuration.yaml @@ -289,4 +289,21 @@ identity_providers: - email - groups userinfo_signing_algorithm: none + - id: immich + description: Immich + secret: '$argon2id$v=19$m=65536,t=3,p=4$vyO+G6qB9FRnIMHVq6FsYQ$U6LkvG5c/cq1lcEnlNhhqAW7+ILn0i+yZIIxls6qp0g' + public: false + authorization_policy: two_factor + redirect_uris: + - https://photos.bhasher.com/auth/login + - https://photos.bhasher.com/user-settings + - app.immich:/ + consent_mode: implicit + scopes: + - openid + - profile + - email + - groups + userinfo_signing_algorithm: none +