From 56f9aa20e3f3b1ef4a994e3ab282f6c1693139b6 Mon Sep 17 00:00:00 2001
From: James Lance <james@thelances.net>
Date: Sat, 7 Mar 2026 17:26:43 -0700
Subject: [PATCH 1/3] feat: add calibre service with local-only access

---
 CLAUDE.md                   |  3 ++-
 docker-compose.yml          | 37 +++++++++++++++++++++++++++++++++++++
 scripts/validate-traefik.sh |  1 +
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index aa53678..f1c8803 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -43,7 +43,7 @@ docker compose down
 ### Service Categories
 - **Infrastructure**: Traefik, Docker Socket Proxy, Authelia, Portainer, Task Scheduler
 - **Media**: Plex (LinuxServer.io, GPU-enabled), Sonarr, Radarr, Bazarr, SABnzbd, NZBHydra2
-- **Books**: Calibre-Web, Lazy Librarian
+- **Books**: Calibre (Full Desktop), Calibre-Web (Frontend), Lazy Librarian
 - **DNS/Ad-blocking**: Pi-hole (port 53)
 - **Home Automation**: Home Assistant (privileged, host network)
 - **Dashboard**: Organizr
@@ -129,6 +129,7 @@ Many applications maintain their own logs on the NFS mount at `/mnt/docker/<serv
 | **Sonarr** | `/mnt/docker/sonarr/logs/` | Built-in (1MB/file, ~25 files) | ~25-30MB |
 | **SABnzbd** | `/mnt/docker/sabnzb/logs/` | Configured (5MB max, 5 backups) | ~30MB |
 | **NZBHydra2** | `/mnt/docker/hydra/logs/` | Date-based rotation | ~1MB |
+| **Calibre** | `/mnt/docker/calibre/logs/` | Built-in | ~10MB |
 | **Home Assistant** | `/mnt/docker/homeassistant/` | Python logging rotation | ~10MB |
 
 **Log levels** are configured per application:
diff --git a/docker-compose.yml b/docker-compose.yml
index f9a2dda..2bf6105 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -86,6 +86,11 @@ volumes:
       type: nfs
       o: addr=192.168.0.6,rw,nfsvers=4.1,async
       device: :/volume1/docker/calibre-web
+  calibre_config:
+    driver_opts:
+      type: nfs
+      o: addr=192.168.0.6,rw,nfsvers=4.1,async
+      device: :/volume1/docker/calibre
   lazylibrarian_config:
     driver_opts:
       type: nfs
@@ -551,6 +556,7 @@ services:
       - sabnzb_config:/config
       - downloads:/downloads
       - video:/video
+      - audiobooks:/audiobooks
     environment:
       - PUID=$PUID
       - PGID=$PGID
@@ -597,6 +603,36 @@ services:
       - "traefik.http.routers.hydra-rtr.service=hydra-svc"
       - "traefik.http.services.hydra-svc.loadbalancer.server.port=5076"
 
+  # Calibre - full desktop interface to book library
+  calibre:
+    image: lscr.io/linuxserver/calibre:latest
+    container_name: calibre
+    restart: unless-stopped
+    networks:
+      - t2_proxy
+    security_opt:
+      - no-new-privileges:true
+    environment:
+      - PUID=$PUID
+      - PGID=$PGID
+      - TZ=$TZ
+    logging: *default-logging
+    volumes:
+      - calibre_config:/config
+      - ebooks:/books
+    labels:
+      - "traefik.enable=true"
+      ## HTTP Routers
+      - "traefik.http.routers.calibre-rtr.entrypoints=https"
+      - "traefik.http.routers.calibre-rtr.rule=Host(`calibre.$DOMAINNAME`)"
+      - "traefik.http.routers.calibre-rtr.tls=true"
+      ## Middlewares
+      - "traefik.http.middlewares.local-ipwhitelist.ipwhitelist.sourcerange=127.0.0.1/32, 192.168.0.0/16, 172.16.0.0/12, 10.0.0.0/8"
+      - "traefik.http.routers.calibre-rtr.middlewares=local-ipwhitelist"
+      ## HTTP Services
+      - "traefik.http.routers.calibre-rtr.service=calibre-svc"
+      - "traefik.http.services.calibre-svc.loadbalancer.server.port=8080"
+
   # Calibre Web - interface to book library
   calibre-web:
     image: lscr.io/linuxserver/calibre-web
@@ -646,6 +682,7 @@ services:
       - lazylibrarian_config:/config
       - downloads:/downloads
       - ebooks:/books
+      - audiobooks:/audiobooks
     labels:
       - "traefik.enable=true"
       ## HTTP Routers
diff --git a/scripts/validate-traefik.sh b/scripts/validate-traefik.sh
index 9f96095..32de458 100755
--- a/scripts/validate-traefik.sh
+++ b/scripts/validate-traefik.sh
@@ -71,6 +71,7 @@ SERVICES=(
     "sabnzb"
     "hydra"
     "books"              # Calibre-Web
+    "calibre"            # Calibre (Local only)
     "lazylib"
     "homeassistant"
     "pihole:/admin/"     # Pi-hole blocks root, test admin path

From b01dc4243e808ae2286b731fe38ccd5e46903b90 Mon Sep 17 00:00:00 2001
From: James Lance <james@thelances.net>
Date: Sat, 7 Mar 2026 17:39:42 -0700
Subject: [PATCH 2/3] feat: update calibre ebook volume to /config/Calibre
 Library

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2bf6105..092ed31 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -619,7 +619,7 @@ services:
     logging: *default-logging
     volumes:
       - calibre_config:/config
-      - ebooks:/books
+      - ebooks:/config/Calibre Library
     labels:
       - "traefik.enable=true"
       ## HTTP Routers

From a5608cccbdfdeda45bd2bf0750d7101df07173a9 Mon Sep 17 00:00:00 2001
From: James Lance <james@thelances.net>
Date: Sat, 7 Mar 2026 18:45:35 -0700
Subject: [PATCH 3/3] feat: switch to headless Calibre management in
 LazyLibrarian and remove redundant Calibre service

---
 CLAUDE.md                   |  3 +--
 docker-compose.yml          | 37 +------------------------------------
 scripts/validate-traefik.sh |  1 -
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index f1c8803..3461a40 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -43,7 +43,7 @@ docker compose down
 ### Service Categories
 - **Infrastructure**: Traefik, Docker Socket Proxy, Authelia, Portainer, Task Scheduler
 - **Media**: Plex (LinuxServer.io, GPU-enabled), Sonarr, Radarr, Bazarr, SABnzbd, NZBHydra2
-- **Books**: Calibre (Full Desktop), Calibre-Web (Frontend), Lazy Librarian
+- **Books**: Calibre-Web (Frontend), Lazy Librarian (Manager)
 - **DNS/Ad-blocking**: Pi-hole (port 53)
 - **Home Automation**: Home Assistant (privileged, host network)
 - **Dashboard**: Organizr
@@ -129,7 +129,6 @@ Many applications maintain their own logs on the NFS mount at `/mnt/docker/<serv
 | **Sonarr** | `/mnt/docker/sonarr/logs/` | Built-in (1MB/file, ~25 files) | ~25-30MB |
 | **SABnzbd** | `/mnt/docker/sabnzb/logs/` | Configured (5MB max, 5 backups) | ~30MB |
 | **NZBHydra2** | `/mnt/docker/hydra/logs/` | Date-based rotation | ~1MB |
-| **Calibre** | `/mnt/docker/calibre/logs/` | Built-in | ~10MB |
 | **Home Assistant** | `/mnt/docker/homeassistant/` | Python logging rotation | ~10MB |
 
 **Log levels** are configured per application:
diff --git a/docker-compose.yml b/docker-compose.yml
index 092ed31..a5ef2bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -86,11 +86,6 @@ volumes:
       type: nfs
       o: addr=192.168.0.6,rw,nfsvers=4.1,async
       device: :/volume1/docker/calibre-web
-  calibre_config:
-    driver_opts:
-      type: nfs
-      o: addr=192.168.0.6,rw,nfsvers=4.1,async
-      device: :/volume1/docker/calibre
   lazylibrarian_config:
     driver_opts:
       type: nfs
@@ -603,36 +598,6 @@ services:
       - "traefik.http.routers.hydra-rtr.service=hydra-svc"
       - "traefik.http.services.hydra-svc.loadbalancer.server.port=5076"
 
-  # Calibre - full desktop interface to book library
-  calibre:
-    image: lscr.io/linuxserver/calibre:latest
-    container_name: calibre
-    restart: unless-stopped
-    networks:
-      - t2_proxy
-    security_opt:
-      - no-new-privileges:true
-    environment:
-      - PUID=$PUID
-      - PGID=$PGID
-      - TZ=$TZ
-    logging: *default-logging
-    volumes:
-      - calibre_config:/config
-      - ebooks:/config/Calibre Library
-    labels:
-      - "traefik.enable=true"
-      ## HTTP Routers
-      - "traefik.http.routers.calibre-rtr.entrypoints=https"
-      - "traefik.http.routers.calibre-rtr.rule=Host(`calibre.$DOMAINNAME`)"
-      - "traefik.http.routers.calibre-rtr.tls=true"
-      ## Middlewares
-      - "traefik.http.middlewares.local-ipwhitelist.ipwhitelist.sourcerange=127.0.0.1/32, 192.168.0.0/16, 172.16.0.0/12, 10.0.0.0/8"
-      - "traefik.http.routers.calibre-rtr.middlewares=local-ipwhitelist"
-      ## HTTP Services
-      - "traefik.http.routers.calibre-rtr.service=calibre-svc"
-      - "traefik.http.services.calibre-svc.loadbalancer.server.port=8080"
-
   # Calibre Web - interface to book library
   calibre-web:
     image: lscr.io/linuxserver/calibre-web
@@ -676,7 +641,7 @@ services:
       - PUID=$PUID
       - PGID=$PGID
       - TZ=$TZ
-      - DOCKER_MODS=linuxserver/calibre-web:calibre|linuxserver/mods:lazylibrarian-ffmpeg #optional
+      - DOCKER_MODS=linuxserver/mods:universal-calibre|linuxserver/mods:lazylibrarian-ffmpeg #optional
     logging: *default-logging
     volumes:
       - lazylibrarian_config:/config
diff --git a/scripts/validate-traefik.sh b/scripts/validate-traefik.sh
index 32de458..9f96095 100755
--- a/scripts/validate-traefik.sh
+++ b/scripts/validate-traefik.sh
@@ -71,7 +71,6 @@ SERVICES=(
     "sabnzb"
     "hydra"
     "books"              # Calibre-Web
-    "calibre"            # Calibre (Local only)
     "lazylib"
     "homeassistant"
     "pihole:/admin/"     # Pi-hole blocks root, test admin path