From 2862618816b4bdddcb410defe3c64c41052525dc Mon Sep 17 00:00:00 2001
From: chris <chris.windler0322@gmail.com>
Date: Tue, 2 Sep 2025 20:40:57 +0200
Subject: [PATCH] Update domain, add kiwix and ollama

---
 docker-compose.yml                         |  2 ++
 project/infrastructure/traefik/traefik.yml |  7 ++-----
 project/media/kiwix/kiwix.yml              | 23 +++++++++++++++++++++
 project/service/ollama/ollama.yml          | 24 ++++++++++++++++++++++
 4 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 project/media/kiwix/kiwix.yml
 create mode 100644 project/service/ollama/ollama.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index e9957ba..8ef1180 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,6 +38,7 @@ include:
       - ${MEDIA_PATH}/prowlarr/prowlarr.yml
       - ${MEDIA_PATH}/qbittorrent/qbittorrent.yml
       - ${MEDIA_PATH}/readarr/readarr.yml
+      - ${MEDIA_PATH}/kiwix/kiwix.yml
     env_file: ${MEDIA_PATH}/.env
 
   - path:
@@ -49,6 +50,7 @@ include:
       - ${SERVICE_PATH}/it-tools/it-tools.yml
       - ${SERVICE_PATH}/jupyter-notebook/jupyter-notebook.yml
       - ${SERVICE_PATH}/mealie/mealie.yml
+      # - ${SERVICE_PATH}/ollama/ollama.yml
       - ${SERVICE_PATH}/paperless-ngx/paperless-ngx.yml
       - ${SERVICE_PATH}/radicale/radicale.yml
       - ${SERVICE_PATH}/shlink/shlink.yml
diff --git a/project/infrastructure/traefik/traefik.yml b/project/infrastructure/traefik/traefik.yml
index d702726..91838fc 100644
--- a/project/infrastructure/traefik/traefik.yml
+++ b/project/infrastructure/traefik/traefik.yml
@@ -18,10 +18,7 @@ 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
+      INFOMANIAK_ACCESS_TOKEN: ${INFOMANIAK_CERTIFICATE_ACCESS_TOKEN}
     volumes:
       - "/var/log/crowdsec/:/var/log/crowdsec/"
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
@@ -55,4 +52,4 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.whoami.rule=Host(`whoami.${LOCAL_DOMAIN}`)"
       - "traefik.http.routers.whoami.entrypoints=https"
-      - 'traefik.http.routers.whoami.tls=true'
\ No newline at end of file
+      - 'traefik.http.routers.whoami.tls=true'
diff --git a/project/media/kiwix/kiwix.yml b/project/media/kiwix/kiwix.yml
new file mode 100644
index 0000000..66cb29d
--- /dev/null
+++ b/project/media/kiwix/kiwix.yml
@@ -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'
diff --git a/project/service/ollama/ollama.yml b/project/service/ollama/ollama.yml
new file mode 100644
index 0000000..5cd9123
--- /dev/null
+++ b/project/service/ollama/ollama.yml
@@ -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"