From f448f29a0308645240c81a88dcd1beb48c0445b3 Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 9 Jun 2025 12:29:21 +0200 Subject: [PATCH] update --- project/infrastructure/authelia/authelia.yml | 6 +++--- project/infrastructure/homepage/homepage.yml | 3 ++- project/infrastructure/traefik/traefik.yml | 4 ++++ project/media/immich/immich.yml | 9 +++++++-- project/media/qbittorrent/qbittorrent.yml | 7 ++++--- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/project/infrastructure/authelia/authelia.yml b/project/infrastructure/authelia/authelia.yml index cd4acf8..55aa70e 100644 --- a/project/infrastructure/authelia/authelia.yml +++ b/project/infrastructure/authelia/authelia.yml @@ -26,8 +26,8 @@ services: AUTHELIA_SESSION_SECRET_FILE: /run/secrets/SESSION_SECRET AUTHELIA_STORAGE_POSTGRES_PASSWORD_FILE: /run/secrets/STORAGE_PASSWORD AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE: /run/secrets/STORAGE_ENCRYPTION_KEY - AUTHELIA_PUBLIC_DOMAIN: ${PUBLIC_DOMAIN} # this does not work for access control or openID yet - AUTHELIA_LOCAL_DOMAIN: ${LOCAL_DOMAIN} # this does not work for access control or openID yet + # AUTHELIA_PUBLIC_DOMAIN: ${PUBLIC_DOMAIN} # this does not work for access control or openID yet + # AUTHELIA_LOCAL_DOMAIN: ${LOCAL_DOMAIN} # this does not work for access control or openID yet volumes: - ${INFRA_PATH}/authelia/config:/config - ${INFRA_PATH}/authelia/config:/config @@ -44,4 +44,4 @@ services: - 'traefik.http.routers.authelia.service=authelia-svc' - 'traefik.http.services.authelia-svc.loadbalancer.server.port=9091' # Middleware - - "traefik.http.routers.authelia.middlewares=crowdsec-bouncer@file" \ No newline at end of file + - "traefik.http.routers.authelia.middlewares=crowdsec-bouncer@file" diff --git a/project/infrastructure/homepage/homepage.yml b/project/infrastructure/homepage/homepage.yml index e06afbb..ee75dc0 100644 --- a/project/infrastructure/homepage/homepage.yml +++ b/project/infrastructure/homepage/homepage.yml @@ -12,6 +12,7 @@ services: environment: HOMEPAGE_VAR_LOCAL_DOMAIN: ${LOCAL_DOMAIN} HOMEPAGE_VAR_PUBLIC_DOMAIN: ${PUBLIC_DOMAIN} + HOMEPAGE_ALLOWED_HOSTS: homepage.${LOCAL_DOMAIN}, 192.168.178.35:3030 volumes: - ${INFRA_PATH}/homepage/config:/app/config - ${INFRA_PATH}/homepage/data/images:/app/public/images @@ -25,4 +26,4 @@ services: - "traefik.enable=true" - "traefik.http.routers.homepage.rule=Host(`homepage.${LOCAL_DOMAIN}`)" - "traefik.http.routers.homepage.entrypoints=https" - - "traefik.http.routers.homepage.tls=true" \ No newline at end of file + - "traefik.http.routers.homepage.tls=true" diff --git a/project/infrastructure/traefik/traefik.yml b/project/infrastructure/traefik/traefik.yml index 8094fb0..d702726 100644 --- a/project/infrastructure/traefik/traefik.yml +++ b/project/infrastructure/traefik/traefik.yml @@ -18,6 +18,10 @@ services: TRAEFIK_PUBLIC_DOMAIN: ${PUBLIC_DOMAIN} TRAEFIK_AUTH_PUBLIC_DOMAIN: auth.${PUBLIC_DOMAIN} TRAEFIK_CROWDSEC_API_KEY: ${CROWDSEC_API_KEY} + NAMESILO_API_KEY: ${NAMESILO_API_KEY} + NAMESILO_PROPAGATION_TIMEOUT: 600 + NAMESILO_POLLING_INTERVAL: 30 + # NAMESILO_TTL: 60 volumes: - "/var/log/crowdsec/:/var/log/crowdsec/" - "/var/run/docker.sock:/var/run/docker.sock:ro" diff --git a/project/media/immich/immich.yml b/project/media/immich/immich.yml index ca4277f..8afaf70 100644 --- a/project/media/immich/immich.yml +++ b/project/media/immich/immich.yml @@ -46,7 +46,7 @@ services: # https://github.com/Salvoxia/immich-folder-album-creator # one time run: - # docker run -e API_URL="https://immich.crescentec.xyz/api/" -e API_KEY="qTaebdVMtph9yD0pSJRJDQJkDEpexiXNMJ5V5HBEnA" -e ROOT_PATH="/usr/src/app/external" -e LOG_LEVEL="DEBUG" salvoxia/immich-folder-album-creator:latest /script/immich_auto_album.sh + # docker run -e -e API_URL="https://immich.crescentec.xyz/api/" -e API_KEY="qTaebdVMtph9yD0pSJRJDQJkDEpexiXNMJ5V5HBEnA" -e ROOT_PATH="/usr/src/app/external" -e LOG_LEVEL="DEBUG" salvoxia/immich-folder-album-creator:latest /script/immich_auto_album.sh immich-folder-album-creator: extends: file: ${TEMPLATES_PATH} @@ -58,6 +58,11 @@ services: API_KEY: qTaebdVMtph9yD0pSJRJDQJkDEpexiXNMJ5V5HBEnA ROOT_PATH: /usr/src/app/external CRON_EXPRESSION: "0 * * * *" + LOG_LEVEL: DEBUG + #RUN_IMMEDIATELY: true + #UNATTENDED: 1 + volumes: + - /usr/src/app/external:/usr/src/app/external labels: # Watchtower - - "com.centurylinklabs.watchtower.enable=true" \ No newline at end of file + - "com.centurylinklabs.watchtower.enable=true" diff --git a/project/media/qbittorrent/qbittorrent.yml b/project/media/qbittorrent/qbittorrent.yml index 3e83a6a..16ddc8d 100644 --- a/project/media/qbittorrent/qbittorrent.yml +++ b/project/media/qbittorrent/qbittorrent.yml @@ -7,13 +7,14 @@ services: container_name: qbittorrent ports: - 2002:2002 - - 6881:6881 - - 6881:6881/udp + - 50059:6881 + - 50059:6881/udp networks: - ip4net + - ip6net environment: - WEBUI_PORT=2002 - - TORRENTING_PORT=6881 + - TORRENTING_PORT=50059 volumes: - ${MEDIA_PATH}/qbittorrent/config:/config - ${MEDIA_PATH}/qbittorrent/downloads:/downloads # do not use this folder, see https://wiki.servarr.com/docker-guide#consistent-and-well-planned-paths -> issues