From bb42bfc7a3ed865fc05790cb82eb36fe0ae89017 Mon Sep 17 00:00:00 2001
From: traveler <phil@pncharris.com>
Date: Mon, 24 Mar 2025 20:18:02 -0500
Subject: [PATCH] kj

---
 calibre.yaml  | 40 ----------------------------------------
 database.yaml |  1 +
 library.yaml  |  3 +++
 3 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100755 calibre.yaml

diff --git a/calibre.yaml b/calibre.yaml
deleted file mode 100755
index 414d30e..0000000
--- a/calibre.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-services:
-  Calibre:
-    image: lscr.io/linuxserver/calibre:latest
-    container_name: calibre
-    hostname: calibre
-    environment:
-      - TZ=America/Chicago
-      - PGID=998
-      - PUID=1001 
-    networks:
-      - netgrimoire
-    volumes:
-      - /DockerVol/Calibre/Config:/config
-      - /DockerVol/Calibre/Plugins:/plugins
-      - /data/nfs/Baxter/Data/media:/data:shared
-    ports:
-      - 7070:8080 
-      - 7081:8081
-    restart: unless-stopped
-    security_opt:
-      - seccomp=unconfined
-   # deploy:
-    labels:
-      - homepage.group=Library
-      - homepage.name=Calibre
-      - homepage.icon=calibre.png
-      - homepage.href=http://calibre.netgrimoire.com
-      - homepage.description=Calibre Library
-      - kuma.calibre.http.name="Calibre"
-      - kuma.calibre.http.url=http://calibre:8080
-      - caddy=calibre.netgrimoire.com
-      - caddy.import=authentik
-      - caddy.reverse_proxy="{{upstreams 8080}}"
-      # placement:
-      #   constraints:
-      #     - node.hostname == nas
-
-networks:
-  netgrimoire:
-    external: true 
\ No newline at end of file
diff --git a/database.yaml b/database.yaml
index 9420c27..b69dd0f 100644
--- a/database.yaml
+++ b/database.yaml
@@ -21,6 +21,7 @@ services:
         - homepage.href=https://pgadmin.netgrimoire.com
         - homepage.description=Postgres Server
         - caddy=pgadmin.netgrimoire.com
+        - caddy.import=authentik
         - caddy.reverse_proxy="{{upstreams 80}}"
     #   placement:
     #     constraints:
diff --git a/library.yaml b/library.yaml
index 2a0efd1..bf7dc3a 100755
--- a/library.yaml
+++ b/library.yaml
@@ -32,6 +32,9 @@ services:
         - caddy=books.netgrimoire.com
         - caddy.import=authentik
         - caddy.reverse_proxy="{{upstreams 8083}}"
+      placement:
+        constraints:
+          - node.labels.general == true