From 563baf2f2871cfd4898ecdaf5a4a1e007c10704e Mon Sep 17 00:00:00 2001
From: traveler <phil@pncharris.com>
Date: Sun, 18 Jan 2026 23:50:55 -0600
Subject: [PATCH] migration of portainer and authentik

---
 swarm/authentik.yaml            | 40 ++++++++++-----------------------
 swarm/portainer-agent-stack.yml |  2 +-
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/swarm/authentik.yaml b/swarm/authentik.yaml
index bc89ea9..44b385e 100755
--- a/swarm/authentik.yaml
+++ b/swarm/authentik.yaml
@@ -11,7 +11,7 @@ services:
     volumes:
       - /DockerVol/Authentik/Postgres:/var/lib/postgresql/data
     environment:
-      POSTGRES_PASSWORD: F@lcon13 
+      POSTGRES_PASSWORD: F@lcon13
       POSTGRES_USER: authentik
       POSTGRES_DB: authentik
       TZ: America/Chicago
@@ -20,16 +20,14 @@ services:
       UMASK: 002
     networks:
       - authentik
-    # env_file:
-    #   - .env
     deploy:
       placement:
         constraints:
-          - node.hostname == nas
+          - node.hostname == znas
 
-    
   redis:
     image: docker.io/library/redis:alpine
+    user: "1964:1964"
     command: --save 60 1 --loglevel warning
     restart: unless-stopped
     healthcheck:
@@ -50,10 +48,11 @@ services:
     deploy:
       placement:
         constraints:
-          - node.hostname == nas
-  
+          - node.hostname == znas
+
   authentik:
     image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.2}
+    user: "1964:1964"
     restart: unless-stopped
     command: server
     environment:
@@ -79,7 +78,7 @@ services:
     deploy:
       placement:
         constraints:
-          - node.hostname == nas
+          - node.hostname == znas
       labels:
         - homepage.group=Management
         - homepage.name=Authentik
@@ -93,9 +92,10 @@ services:
     depends_on:
       - postgresql
       - redis
-  
+
   worker:
     image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.2}
+    user: "1964:1964"
     restart: unless-stopped
     command: worker
     environment:
@@ -109,13 +109,6 @@ services:
       PGID: 998
       PUID: 1001
       UMASK: 002
-    # `user: root` and the docker socket volume are optional.
-    # See more for the docker socket integration here:
-    # https://goauthentik.io/docs/outposts/integrations/docker
-    # Removing `user: root` also prevents the worker from fixing the permissions
-    # on the mounted folders, so when removing this make sure the folders have the correct UID/GID
-    # (1000:1000 by default)
-    user: root
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /DockerVol/Authentik/media:/media
@@ -129,19 +122,10 @@ services:
     deploy:
       placement:
         constraints:
-          - node.hostname == nas
-
-volumes:
-  database:
-    driver: local
-  redis:
-    driver: local
+          - node.hostname == znas
 
 networks:
   netgrimoire:
-    external: true  
+    external: true
   authentik:
-    external: true 
-
-
-# import the .env file first:  set -a; . ./.env; set +a
+    external: true
diff --git a/swarm/portainer-agent-stack.yml b/swarm/portainer-agent-stack.yml
index dbf142c..a4fdf92 100755
--- a/swarm/portainer-agent-stack.yml
+++ b/swarm/portainer-agent-stack.yml
@@ -35,7 +35,7 @@ services:
         # - caddy.reverse_proxy="{{upstreams 9000}}"   
       placement:
         constraints:
-          - node.hostname == nas
+          - node.hostname == znas
 
 networks:
   netgrimoire: