From 3a39161d6c2b0c48b2f64e0a56c8a9d3150098f4 Mon Sep 17 00:00:00 2001
From: Jean Froment <jean.froment@apalia.net>
Date: Mon, 7 Nov 2022 22:27:20 +0100
Subject: [PATCH] Separate calibre and calibre-web

---
 README.md                 |  3 ++-
 config.sample.yaml        |  7 ++++++-
 run-seedbox.sh            |  9 +++++++++
 services/calibre-web.yaml | 13 +++++++++++++
 services/calibre.yaml     | 13 -------------
 5 files changed, 30 insertions(+), 15 deletions(-)
 create mode 100644 services/calibre-web.yaml

diff --git a/README.md b/README.md
index 0dfa3d4..2ba2140 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,8 @@ Version 2 is released, please make sure you read [this V2 Migration Guide](doc/U
 | Bazarr               | bazarr.yourdomain.com      | [linuxserver/bazarr](https://hub.docker.com/r/linuxserver/bazarr)      | *latest*                | Subtitles monitor   |
 | Lidarr               | lidarr.yourdomain.com      | [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr)      | *develop*               | Music monitor       |
 | Readarr               | readarr.yourdomain.com      | [linuxserver/readarr](https://hub.docker.com/r/linuxserver/readarr)      | *nightly*               | Ebook and comic monitor       |
-| Calibre + Calibre-web | calibre.yourdomain.com | [linuxserver/calibre-web](https://hub.docker.com/r/linuxserver/calibre-web)  | *latest* | Book management + UI |
+| Calibre | calibre-admin.yourdomain.com | [linuxserver/calibre](https://hub.docker.com/r/linuxserver/calibre)  | *latest* | eBook management |
+| Calibre-web | calibre.yourdomain.com | [linuxserver/calibre-web](https://hub.docker.com/r/linuxserver/calibre-web)  | *latest* | Book management UI |
 | Komga               | komga.yourdomain.com      | [gotson/komga](https://hub.docker.com/r/gotson/komga)      | *latest*               | Comic Book Manager       |
 | Kavita               | Kavita.yourdomain.com      | [gotson/komga](https://hub.docker.com/r/gotson/komga)      | *latest*               | Comic Book Manager       |
 | Ombi               | ombi.yourdomain.com      | [linuxserver/ombi](https://hub.docker.com/r/linuxserver/ombi)      | *latest*               | Plex content requests       |
diff --git a/config.sample.yaml b/config.sample.yaml
index a76244e..182cf49 100644
--- a/config.sample.yaml
+++ b/config.sample.yaml
@@ -120,9 +120,14 @@ services:
         - host: calibre-admin.${TRAEFIK_DOMAIN}
           httpAuth: true
           internalPort: 8080
+  - name: calibre-web
+    enabled: false
+    vpn: false
+    traefik:
+      enabled: true
+      rules:
         - host: calibre.${TRAEFIK_DOMAIN}
           httpAuth: true
-          service: calibre-web@docker
           internalPort: 8083
   - name: komga
     enabled: false
diff --git a/run-seedbox.sh b/run-seedbox.sh
index bddd2e4..bd35040 100755
--- a/run-seedbox.sh
+++ b/run-seedbox.sh
@@ -119,6 +119,15 @@ if [[ $(cat config.json | jq '[.services[] | select(.name=="flood" and .enabled=
   fi
 fi
 
+# Check that if calibre-web is enabled, calibre should also be enabled
+if [[ $(cat config.json | jq '[.services[] | select(.name=="calibre-web" and .enabled==true)] | length') -eq 1 ]]; then
+  if [[ $(cat config.json | jq '[.services[] | select(.name=="calibre" and .enabled==false)] | length') -eq 1 ]]; then
+    echo "[$0] ERROR. Calibre-web is enabled but Calibre is not. Please either enable Calibre or disable Calibre-web as Calibre-web depends on Calibre."
+    echo "[$0] ******* Exiting *******"
+    exit 1
+  fi
+fi
+
 # Apply other arbitrary custom Traefik config files
 rm -f $f traefik/custom/custom-*
 for f in `find samples/custom-traefik -maxdepth 1 -mindepth 1 -type f | grep -E "\.yml$|\.yaml$" | sort`; do
diff --git a/services/calibre-web.yaml b/services/calibre-web.yaml
new file mode 100644
index 0000000..c1480a5
--- /dev/null
+++ b/services/calibre-web.yaml
@@ -0,0 +1,13 @@
+services:
+  calibre-web:
+    image: ghcr.io/linuxserver/calibre-web
+    container_name: calibre-web
+    restart: always
+    environment:
+      - PGID=${PGID}
+      - PUID=${PUID}
+      - TZ=${TZ}
+      - DOCKER_MODS=linuxserver/mods:universal-calibre
+      - OAUTHLIB_RELAX_TOKEN_SCOPE=1
+    volumes:
+      - configcalibre:/config
\ No newline at end of file
diff --git a/services/calibre.yaml b/services/calibre.yaml
index d5abeba..de9a6e7 100644
--- a/services/calibre.yaml
+++ b/services/calibre.yaml
@@ -12,19 +12,6 @@ services:
     volumes:
       - configcalibre:/config
 
-  calibre-web:
-    image: ghcr.io/linuxserver/calibre-web
-    container_name: calibre-web
-    restart: always
-    environment:
-      - PGID=${PGID}
-      - PUID=${PUID}
-      - TZ=${TZ}
-      - DOCKER_MODS=linuxserver/mods:universal-calibre
-      - OAUTHLIB_RELAX_TOKEN_SCOPE=1
-    volumes:
-      - configcalibre:/config
-
 volumes:
   configcalibre: 
     driver: local-persist