From fa92faa62f4d68819010d2d72b7bd246893a778e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Wed, 21 Aug 2024 22:29:04 +0200 Subject: [PATCH] heimdall and paperless fix --- .pre-commit-config.yaml | 2 +- inventory.py | 3 ++- services/heimdall/.env.template | 5 +++++ services/heimdall/docker-compose.yml | 30 +++++++++++++++++++++++++++ services/paperless/docker-compose.yml | 8 +++---- 5 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 services/heimdall/.env.template create mode 100644 services/heimdall/docker-compose.yml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e2766bc..27133cf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: hooks: - id: reorder-python-imports - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.4 + rev: v0.6.1 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/inventory.py b/inventory.py index b24316b..d402f28 100644 --- a/inventory.py +++ b/inventory.py @@ -6,7 +6,7 @@ servers = [ "services": [ "traefik", "joplin", "kanboard", "ntfy", "uptime-kuma", "usememos", - "authentik-ldap", + "authentik-ldap", "heimdall", ], }, @@ -17,6 +17,7 @@ servers = [ "web_server": True, "services": [ "nginx", "immich", "nodered", "authentik", + "paperless", ], }, ), diff --git a/services/heimdall/.env.template b/services/heimdall/.env.template new file mode 100644 index 0000000..5d95dc1 --- /dev/null +++ b/services/heimdall/.env.template @@ -0,0 +1,5 @@ +HOST=dash.katuwoss.dev + +PUID=1000 +PGID=1000 +TZ=Europe/Prague diff --git a/services/heimdall/docker-compose.yml b/services/heimdall/docker-compose.yml new file mode 100644 index 0000000..8df4c64 --- /dev/null +++ b/services/heimdall/docker-compose.yml @@ -0,0 +1,30 @@ +volumes: + heimdall-config: + name: heimdall-config + +networks: + traefik-net: + external: true + name: traefik-net + +x-traefik-net: &x-traefik-net + networks: + - traefik-net + - default + +services: + heimdall: + image: lscr.io/linuxserver/heimdall:latest + <<: *x-traefik-net + env_file: + - .env + volumes: + - heimdall-config:/config + deploy: + labels: + - traefik.enable=true + - traefik.docker.network=traefik-net + - traefik.http.routers.heimdall.rule=Host(`${HOST}`) + - traefik.http.routers.heimdall.entrypoints=${ENTRYPOINTS:-websecure} + - traefik.http.routers.heimdall.tls.certresolver=le + - traefik.http.services.heimdall.loadbalancer.server.port=80 diff --git a/services/paperless/docker-compose.yml b/services/paperless/docker-compose.yml index 70188ad..6bf657f 100644 --- a/services/paperless/docker-compose.yml +++ b/services/paperless/docker-compose.yml @@ -46,7 +46,7 @@ services: labels: - traefik.enable=true - traefik.docker.network=traefik-net - - traefik.http.routers.immich.rule=Host(`${HOST}`) - - traefik.http.routers.immich.entrypoints=${ENTRYPOINTS:-websecure} - - traefik.http.routers.immich.tls.certresolver=le - - traefik.http.services.immich.loadbalancer.server.port=8000 + - traefik.http.routers.paperless.rule=Host(`${HOST}`) + - traefik.http.routers.paperless.entrypoints=${ENTRYPOINTS:-websecure} + - traefik.http.routers.paperless.tls.certresolver=le + - traefik.http.services.paperless.loadbalancer.server.port=8000