Update domain, add kiwix and ollama

This commit is contained in:
chris
2025-09-02 20:40:57 +02:00
parent e6ce62ae09
commit 2862618816
4 changed files with 51 additions and 5 deletions

View File

@@ -38,6 +38,7 @@ include:
- ${MEDIA_PATH}/prowlarr/prowlarr.yml - ${MEDIA_PATH}/prowlarr/prowlarr.yml
- ${MEDIA_PATH}/qbittorrent/qbittorrent.yml - ${MEDIA_PATH}/qbittorrent/qbittorrent.yml
- ${MEDIA_PATH}/readarr/readarr.yml - ${MEDIA_PATH}/readarr/readarr.yml
- ${MEDIA_PATH}/kiwix/kiwix.yml
env_file: ${MEDIA_PATH}/.env env_file: ${MEDIA_PATH}/.env
- path: - path:
@@ -49,6 +50,7 @@ include:
- ${SERVICE_PATH}/it-tools/it-tools.yml - ${SERVICE_PATH}/it-tools/it-tools.yml
- ${SERVICE_PATH}/jupyter-notebook/jupyter-notebook.yml - ${SERVICE_PATH}/jupyter-notebook/jupyter-notebook.yml
- ${SERVICE_PATH}/mealie/mealie.yml - ${SERVICE_PATH}/mealie/mealie.yml
# - ${SERVICE_PATH}/ollama/ollama.yml
- ${SERVICE_PATH}/paperless-ngx/paperless-ngx.yml - ${SERVICE_PATH}/paperless-ngx/paperless-ngx.yml
- ${SERVICE_PATH}/radicale/radicale.yml - ${SERVICE_PATH}/radicale/radicale.yml
- ${SERVICE_PATH}/shlink/shlink.yml - ${SERVICE_PATH}/shlink/shlink.yml

View File

@@ -18,10 +18,7 @@ services:
TRAEFIK_PUBLIC_DOMAIN: ${PUBLIC_DOMAIN} TRAEFIK_PUBLIC_DOMAIN: ${PUBLIC_DOMAIN}
TRAEFIK_AUTH_PUBLIC_DOMAIN: auth.${PUBLIC_DOMAIN} TRAEFIK_AUTH_PUBLIC_DOMAIN: auth.${PUBLIC_DOMAIN}
TRAEFIK_CROWDSEC_API_KEY: ${CROWDSEC_API_KEY} TRAEFIK_CROWDSEC_API_KEY: ${CROWDSEC_API_KEY}
NAMESILO_API_KEY: ${NAMESILO_API_KEY} INFOMANIAK_ACCESS_TOKEN: ${INFOMANIAK_CERTIFICATE_ACCESS_TOKEN}
NAMESILO_PROPAGATION_TIMEOUT: 600
NAMESILO_POLLING_INTERVAL: 30
# NAMESILO_TTL: 60
volumes: volumes:
- "/var/log/crowdsec/:/var/log/crowdsec/" - "/var/log/crowdsec/:/var/log/crowdsec/"
- "/var/run/docker.sock:/var/run/docker.sock:ro" - "/var/run/docker.sock:/var/run/docker.sock:ro"

View File

@@ -0,0 +1,23 @@
services:
kiwix:
extends:
file: ${TEMPLATES_PATH}
service: default
image: ghcr.io/kiwix/kiwix-serve
container_name: kiwix
ports:
- 2009:8080
networks:
- ip4net
volumes:
- ${EXTERNAL_STORAGE}/kiwix/:/data
command:
- '*.zim'
labels:
# Watchtower
- "com.centurylinklabs.watchtower.enable=true"
# Traefik
- "traefik.enable=true"
- "traefik.http.routers.kiwix.rule=Host(`kiwix.${LOCAL_DOMAIN}`)"
- "traefik.http.routers.kiwix.entrypoints=https"
- 'traefik.http.routers.kiwix.tls=true'

View File

@@ -0,0 +1,24 @@
services:
ollama:
extends:
file: ${TEMPLATES_PATH}
service: default
image: ollama/ollama
container_name: ollama
ports:
- 4019:11434
networks:
- ip6net
volumes:
- ${SERVICE_PATH}/ollama/data:/root/.ollama
labels:
# Watchtower
- "com.centurylinklabs.watchtower.enable=true"
# Traefik
- "traefik.enable=true"
- "traefik.http.routers.ollama.rule=Host(`ollama.${PUBLIC_DOMAIN}`)"
- "traefik.http.routers.ollama.entrypoints=https"
- "traefik.http.routers.ollama.tls=true"
- "traefik.http.routers.ollama.tls.certresolver=myresolver"
# Middlewares
- "traefik.http.routers.ollama.middlewares=crowdsec-bouncer@file"