From 247956f05cae4a0ead0c37fd2e68924775840c6b Mon Sep 17 00:00:00 2001
From: traveler <phil@pncharris.com>
Date: Tue, 7 Apr 2026 14:09:49 -0500
Subject: [PATCH] fg

---
 swarm/diun.yaml |  2 ++
 swarm/ntfy.yaml | 41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/swarm/diun.yaml b/swarm/diun.yaml
index d94b2e3..783003c 100644
--- a/swarm/diun.yaml
+++ b/swarm/diun.yaml
@@ -21,6 +21,8 @@ services:
       placement:
         constraints:
           - node.role == manager
+          - node.platform.arch != arm64
+          - node.platform.arch != arm
       restart_policy:
         condition: on-failure
         delay: 5s
diff --git a/swarm/ntfy.yaml b/swarm/ntfy.yaml
index 1359d11..80110c9 100644
--- a/swarm/ntfy.yaml
+++ b/swarm/ntfy.yaml
@@ -1,29 +1,48 @@
-
+# Run with docker stack deploy -c ntfy.yaml ntfy
 services:
   ntfy:
     image: binwiederhier/ntfy
     command: serve
+    user: "1964:1964"
     environment:
       TZ: America/Chicago
-    user: "1964:1964"
-    networks:
-      - netgrimoire
     volumes:
       - /data/nfs/znas/Docker/ntfy/cache:/var/cache/ntfy
       - /data/nfs/znas/Docker/ntfy/etc:/etc/ntfy
     ports:
       - 81:80
+    networks:
+      - netgrimoire
     deploy:
       restart_policy:
         condition: any
-        delay: 10s
-        max_attempts: 5
-        window: 60s
+        delay: 5s
+        max_attempts: 3
+        window: 120s
+      placement:
+        constraints:
+          - node.platform.arch != arm64
+          - node.platform.arch != arm
       labels:
-        caddy: "ntfy.netgrimoire.com"
-        #caddy.import: "authentik"
-        caddy.reverse_proxy: "{{upstreams 80}}"
+        # --- Caddy ---
+        caddy: ntfy.netgrimoire.com
+        caddy.reverse_proxy: ntfy:80
+        caddy.import: crowdsec
+
+        # --- Uptime Kuma ---
+        kuma.ntfy.http.name: ntfy
+        kuma.ntfy.http.url: https://ntfy.netgrimoire.com
+
+        # --- Homepage ---
+        homepage.group: Services
+        homepage.name: ntfy
+        homepage.icon: ntfy.png
+        homepage.href: https://ntfy.netgrimoire.com
+        homepage.description: Push Notifications
+
+        # --- DIUN ---
+        diun.enable: "true"
 
 networks:
   netgrimoire:
-    external: true
+    external: true
\ No newline at end of file