updated wud configuration

2026-07-17 09:42:46 +10:00
parent dd9d798bae
commit 80bdeb8d9d
15 changed files with 49 additions and 23 deletions
@@ -25,6 +25,7 @@ services:
      - "traefik.http.services.gitea.loadbalancer.server.port=3000"
      - "io.portainer.accesscontrol.public"
      - "traefik.docker.network=core_traefik"
+      - "wud.watch=true"

    healthcheck:
      test: ["CMD-SHELL", "curl -fsS http://localhost:3000/api/healthz >/dev/null"]
@@ -52,6 +52,7 @@ services:
      - "io.portainer.accesscontrol.public"
      - "traefik.http.services.gramps.loadbalancer.server.port=5000"
      - "traefik.docker.network=core_traefik"
+      - "wud.watch=true"
    networks:
      - traefik
      - gramps
@@ -108,6 +109,8 @@ services:
      - ${DOCKER_VOLUMES}/gramps-data/db:/root/.gramps/grampsdb
      - ${DOCKER_VOLUMES}/gramps-data/media:/app/media
      - ${DOCKER_VOLUMES}/gramps-data/tmp:/tmp
+    labels:
+      - "wud.watch=true"

    networks:
      - gramps
@@ -135,6 +138,8 @@ services:
      timeout: 5s
      retries: 6
      start_period: 10s
+    labels:
+      - "wud.watch=true"

 networks:
  gramps:
@@ -62,6 +62,7 @@ services:
      - "traefik.http.middlewares.nextcloud-webfinger.redirectregex.regex=https://(.*)/.well-known/webfinger"
      - "traefik.http.middlewares.nextcloud-webfinger.redirectregex.replacement=https://$${1}/nextcloud/index.php/.well-known/webfinger"
      - "traefik.docker.network=core_traefik"
+      - "wud.watch=true"
    healthcheck:
      test:
        - CMD-SHELL
@@ -103,6 +104,7 @@ services:
      - nextcloud
    labels:
      - "io.portainer.accesscontrol.public"
+      - "wud.watch=true"
    healthcheck:
      test: ["CMD-SHELL", "mariadb-admin ping -u $$MYSQL_USER --password=$$(cat /run/secrets/nextcloud_db_password) --silent"]
      interval: 10s
@@ -110,6 +112,7 @@ services:
      retries: 12
      start_period: 60s
      
+
  nextcloud-redis:
    image: "redis"
    profiles: ["apps","all","nextcloud"]
@@ -127,6 +130,7 @@ services:
      - nextcloud
    labels:
      - "io.portainer.accesscontrol.public"
+      - "wud.watch=true"
    healthcheck:
 #      test: ["CMD-SHELL", "redis-cli -a \"$$(cat /run/secrets/nextcloud_redis_password)\" PING | grep -q PONG"]
      test: ["CMD-SHELL", "redis-cli  PING | grep -q PONG"]
@@ -26,6 +26,7 @@ services:
      start_period: 60s
    labels:
      - "io.portainer.accesscontrol.public"
+      - "wud.watch=true"

  passbolt-webapp:
    image: passbolt/passbolt:latest-ce
@@ -71,6 +72,7 @@ services:
      - "traefik.http.routers.passbolt.tls.certresolver=myresolver"
      - "io.portainer.accesscontrol.public"
      - "traefik.docker.network=core_traefik"
+      - "wud.watch=true"
    healthcheck:
      test: ["CMD-SHELL", "curl -fsS http://localhost/healthcheck/status | grep -qx OK"]
      interval: 30s
@@ -20,6 +20,7 @@ services:
      - "io.portainer.accesscontrol.public"
 #       - "traefik.http.routers.searxng.middlewares=crowdsec@file,secHeaders@file,error-pages-middleware"
      - "traefik.http.services.searxng.loadbalancer.server.port=8080"
+      - "wud.watch=true"
    healthcheck:
      test: ["CMD-SHELL", "python3 -c \"import urllib.request,sys; r=urllib.request.urlopen('http://127.0.0.1:8080/', timeout=3); sys.exit(0 if 200<=r.status<400 else 1)\""]
      interval: 20s
@@ -31,3 +31,4 @@ services:
      - traefik.http.middlewares.authelia.forwardauth.trustForwardHeader=true
      - traefik.http.middlewares.authelia.forwardauth.authResponseHeaders=Remote-User,Remote-Groups
      - traefik.http.middlewares.authelia.forwardauth.maxResponseBodySize=2097152
+      - "wud.watch=true"
@@ -27,3 +27,5 @@ services:
      timeout: 10s
      retries: 3
      start_period: 15s
+    labels:
+      - "wud.watch=true"
@@ -25,3 +25,4 @@ services:
      # define service properties
      - "traefik.http.services.error-pages-service.loadbalancer.server.port=8080"
      - "io.portainer.accesscontrol.public"
+      - "wud.watch=true"
@@ -48,6 +48,7 @@ services:
      - "io.portainer.accesscontrol.public"
      - "traefik.docker.network=core_traefik"
      - "traefik.http.routers.traefik.observability.tracing=true"
+      - "wud.watch=true"
      
    networks:
 #      - reverse_proxy
@@ -19,7 +19,7 @@ ERROR_PAGES_TEMPLATE_NAME=app-down
 GITEA_USER_UID=1000
 GITEA_USER_GID=1000
 GITEA_DB_TYPE=sqlite3
-GITEA_ROOT_URL=https://gitea.lan.ddnsgeek.com/
+GITEA_ROOT_URL=https://gitea.${DOMAIN}/
 # Generate a token in Gitea: Site Administration → Actions → Runners
 # or Repo → Settings → Actions → Runners
 GITEA_RUNNER_REGISTRATION_TOKEN=vYDNxzMvayREkXoaAR3x3UREkxQB2PU4eORzmkZ9
@@ -27,12 +27,12 @@ GITEA_RUNNER_NAME=docker-runner-01
 GITEA_RUNNER_LABELS=ubuntu-latest:docker://node:20-bookworm,ubuntu-22.04:docker://node:20-bookworm,linux:docker://node:20-bookworm,docker:docker://docker:cli

 # Grafana
-GRAFANA_ROOT_URL=https://grafana.lan.ddnsgeek.com/
+GRAFANA_ROOT_URL=https://grafana.${DOMAIN}/

 # Nextcloud
 NEXTCLOUD_MYSQL_DATABASE=nextcloud
 NEXTCLOUD_MYSQL_HOST=nextcloud_db:3306
-NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.lan.ddnsgeek.com
+NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.${DOMAIN}
 NEXTCLOUD_OVERWRITEPROTOCOL=https
 NEXTCLOUD_OVERWRITECLIURL=https://${NEXTCLOUD_TRUSTED_DOMAINS}
 NEXTCLOUD_SMTP_HOST=smtp.gmail.com
@@ -48,12 +48,12 @@ NEXTCLOUD_DATA=/mnt/nextcloud-data
 PASSBOLT_MYSQL_RANDOM_ROOT_PASSWORD=true
 PASSBOLT_MYSQL_DATABASE=passbolt
 PASSBOLT_MYSQL_USER=passbolt
-PASSBOLT_APP_FULL_BASE_URL=https://passbolt.lan.ddnsgeek.com
+PASSBOLT_APP_FULL_BASE_URL=https://passbolt.${DOMAIN}
 PASSBOLT_DATASOURCES_DEFAULT_HOST=passbolt-db

 # Gramps
 GRAMPSWEB_TREE=main
-GRAMPSWEB_BASE_URL=https://familytree.lan.ddnsgeek.com
+GRAMPSWEB_BASE_URL=https://familytree.${DOMAIN}
 GRAMPSWEB_REGISTRATION_DISABLED=true
 GRAMPSWEB_EMAIL_HOST=smtp.gmail.com
 GRAMPSWEB_EMAIL_PORT=587
@@ -89,13 +89,14 @@ MTLS_BRIDGE_CLIENT_KEY=/certs/clients/office-pc/office-pc.key
 MTLS_BRIDGE_CLIENT_CERT=/certs/clients/office-pc/office-pc.crt
 MTLS_BRIDGE_TARGET_URL=http://node-red:1880
 MTLS_BRIDGE_ALLOWED_PATHS_FILE=
-MTLS_BRIDGE_CORS_ALLOW_ORIGIN=https://grafana.lan.ddnsgeek.com
+MTLS_BRIDGE_CORS_ALLOW_ORIGIN=https://grafana.${DOMAIN}

 # Whats up Docker
 WUD_WATCHER_LOCAL_CRON="0 */6 * * *"
-WUD_TRIGGER_GOTIFY_URL=https://gotify.lan.ddnsgeek.com
+WUD_WATCHER_LOCAL_HOST=docker-socket-proxy
+WUD_WATCHER_LOCAL_WATCHBYDEFAULT=false
+WUD_WATCHER_RASPI_HOST=raspberrypi.tail13f623.ts.net
+WUD_TRIGGER_GOTIFY_URL=http://gotify
 WUD_TRIGGER_GOTIFY_TOKEN=ARPi3hyrAdEUSu6
 WUD_TRIGGER_GOTIFY_PRIORITY=5
-WUD_TRIGGER_GOTIFY_TITLE="Docker Updates"

-WUD_TRIGGER_GOTIFY_gotify_TOKEN="ARPi3hyrAdEUSu6"
@@ -30,6 +30,7 @@ services:
      - "io.portainer.accesscontrol.public"
      - "traefik.docker.network=core_traefik"
      - "traefik.http.routers.beszel.tls.options=mtls-private-admin@file"
+      - "wud.watch=true"

  beszel-agent:
    profiles: ["monitoring","all","beszel"]
@@ -55,6 +56,8 @@ services:
 #    networks:
 #      - beszel
 #      - monitor
+    labels:
+      - "wud.watch=true"

 #networks:
 #  beszel:
@@ -47,3 +47,5 @@ services:
      - traefik
    ports:
      - 2375:2375
+    labels:
+      - "wud.watch=true"
@@ -27,6 +27,7 @@ services:
      - "traefik.http.routers.gotify.tls.certresolver=myresolver"
      - "traefik.http.routers.gotify.tls.options=mtls-private-admin@file"
      - "traefik.http.services.gotify.loadbalancer.server.port=80"
+      - "wud.watch=true"
    ports:
      - 8080:80
 #volumes:
@@ -26,6 +26,7 @@ services:
      - traefik.docker.network=core_traefik
      # Service -> container port
      - traefik.http.services.monitor.loadbalancer.server.port=3001
+      - "wud.watch=true"
    networks:
 #      - traefik_reverse_proxy
      - traefik
@@ -15,13 +15,13 @@ services:
      TZ: ${TZ}
      WUD_LOG_LEVEL: TRACE
      # Docker Socket Proxy
-      WUD_WATCHER_LOCAL_HOST: docker-socket-proxy
+      WUD_WATCHER_LOCAL_HOST: ${WUD_WATCHER_LOCAL_HOST}
 #      WUD_WATCHER_LOCAL_SOCKET: /var/run/docker.sock
      # Check every 6 hours
      WUD_WATCHER_LOCAL_CRON: ${WUD_WATCHER_LOCAL_CRON}
-      WUD_WATCHER_LOCAL_WATCHBYDEFAULT: false
+      WUD_WATCHER_LOCAL_WATCHBYDEFAULT: ${WUD_WATCHER_LOCAL_WATCHBYDEFAULT}

-      WUD_WATCHER_RASPI_HOST: raspberrypi.tail13f623.ts.net
+      WUD_WATCHER_RASPI_HOST: ${WUD_WATCHER_RASPI_HOST}
      WUD_WATCHER_RASPI_CRON: ${WUD_WATCHER_LOCAL_CRON}
      # Gotify
      # WUD_TRIGGER_GOTIFY_URL: ${WUD_TRIGGER_GOTIFY_URL}
@@ -29,9 +29,9 @@ services:
      # WUD_TRIGGER_GOTIFY_PRIORITY: ${WUD_TRIGGER_GOTIFY_PRIORITY}
      # WUD_TRIGGER_GOTIFY_TITLE: ${WUD_TRIGGER_GOTIFY_TITLE} 

-      WUD_TRIGGER_GOTIFY_gotify_PRIORITY: ${WUD_TRIGGER_GOTIFY_PRIORITY}
-      WUD_TRIGGER_GOTIFY_gotify_TOKEN: ${WUD_TRIGGER_GOTIFY_gotify_TOKEN}
-      WUD_TRIGGER_GOTIFY_gotify_URL: http://gotify
+      WUD_TRIGGER_GOTIFY_APP_PRIORITY: ${WUD_TRIGGER_GOTIFY_PRIORITY}
+      WUD_TRIGGER_GOTIFY_APP_TOKEN: ${WUD_TRIGGER_GOTIFY_TOKEN}
+      WUD_TRIGGER_GOTIFY_APP_URL: ${WUD_TRIGGER_GOTIFY_URL}


    labels: