From 827cd9975d7366741545837e63e1e9f814ba2c52 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Wed, 26 Jun 2024 10:34:44 +0000 Subject: [PATCH] diun manuell aktivieren --- firefoxsync/docker-compose.yaml | 2 ++ git/docker-compose.yaml | 2 ++ monitoring/docker-compose.yaml | 12 +++++++++++- nextcloud/docker-compose.yaml | 8 ++++++++ proxy/docker-compose.yaml | 4 ++++ push/docker-compose.yaml | 1 + rustdesk/docker-compose.yml | 2 ++ wallabag/docker-compose.yaml | 3 +++ www/docker-compose.yaml | 1 + 9 files changed, 34 insertions(+), 1 deletion(-) diff --git a/firefoxsync/docker-compose.yaml b/firefoxsync/docker-compose.yaml index 7fb5c27..df991bf 100644 --- a/firefoxsync/docker-compose.yaml +++ b/firefoxsync/docker-compose.yaml @@ -16,6 +16,7 @@ services: - "traefik.http.routers.ffs.tls.options=intermediate@file" - "traefik.http.services.ffs.loadbalancer.server.port=5000" - "docker.group=firefoxsync" + - "diun.enable=true" restart: unless-stopped environment: - SYNCSERVER_PUBLIC_URL=https://firefoxsync.${DOMAIN} @@ -46,6 +47,7 @@ services: timeout: 5s labels: - "docker.group=firefoxsync" + - "diun.enable=true" networks: diff --git a/git/docker-compose.yaml b/git/docker-compose.yaml index 56eceee..939c3cf 100644 --- a/git/docker-compose.yaml +++ b/git/docker-compose.yaml @@ -39,6 +39,7 @@ services: - "traefik.http.middlewares.gitearedir.redirectregex.permanent=true" - "traefik.http.services.forgejo.loadbalancer.server.port=3000" - "docker.group=git" + - "diun.enable=true" db: @@ -58,6 +59,7 @@ services: timeout: 5s labels: - "docker.group=git" + - "diun.enable=true" networks: diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index f731fd9..f247051 100644 --- a/monitoring/docker-compose.yaml +++ b/monitoring/docker-compose.yaml @@ -16,6 +16,7 @@ services: - "traefik.http.services.grafana.loadbalancer.server.port=3000" - "traefik.docker.network=web" - "docker.group=monitoring" + - "diun.enable=true" environment: - GF_DEFAULT_INSTANCE_NAME=monitoring.${DOMAIN} - GF_SERVER_ROOT_URL=http://monitoring.${DOMAIN} @@ -34,6 +35,7 @@ services: depends_on: - influxdb - grafanadb + grafanadb: @@ -53,6 +55,7 @@ services: timeout: 5s labels: - "docker.group=monitoring" + - "diun.enable=true" influxdb: @@ -77,6 +80,7 @@ services: - "traefik.http.routers.influxdb.middlewares=influxauth" - "traefik.http.middlewares.influxauth.basicauth.users=${INFLUXDB_HTPASSWD}" - "docker.group=monitoring" + - "diun.enable=true" prometheus: @@ -91,6 +95,7 @@ services: - ${VOLUMES_PATH}/monitoring/prometheus:/prometheus labels: - "docker.group=monitoring" + - "diun.enable=true" # https://github.com/xperimental/nextcloud-exporter nextcloud-exporter: @@ -103,6 +108,7 @@ services: - NEXTCLOUD_LISTEN_ADDRESS=:9205 labels: - "docker.group=monitoring" + - "diun.enable=true" diun: @@ -119,11 +125,13 @@ services: - "DIUN_WATCH_SCHEDULE=0 */6 * * *" - "DIUN_WATCH_JITTER=30s" - "DIUN_PROVIDERS_DOCKER_ENDPOINT=tcp://docker-socket-proxy:2375" - - "DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=true" + - "DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=false" - "DIUN_NOTIF_NTFY_ENDPOINT=${NTFY_SERVER}" - "DIUN_NOTIF_NTFY_TOPIC=${NTFY_TOPIC}" - "DIUN_NOTIF_NTFY_TOKEN=${NTFY_TOKEN}" restart: always + labels: + - "diun.enable=true" ################################################################## @@ -148,6 +156,7 @@ services: network_mode: "host" labels: - "docker.group=monitoring" + - "diun.enable=true" depends_on: - influxdb @@ -162,6 +171,7 @@ services: - dockersocket labels: - "docker.group=monitoring" + - "diun.enable=true" depends_on: - influxdb diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml index e7006ab..9113a32 100644 --- a/nextcloud/docker-compose.yaml +++ b/nextcloud/docker-compose.yaml @@ -29,6 +29,7 @@ services: - "traefik.http.middlewares.nextcloudHeader.headers.customResponseHeaders.X-Robots-Tag=noindex,nofollow" - "traefik.http.routers.nextcloud.middlewares=nextcloudHeader" - "docker.group=netxtcloud" + - "diun.enable=true" app: @@ -105,6 +106,7 @@ services: - "traefik.http.routers.ncpush.middlewares=ncpushstrip" - "traefik.http.middlewares.ncpushstrip.stripprefix.prefixes=/push" - "docker.group=proxy" + - "diun.enable=true" db: @@ -136,6 +138,7 @@ services: timeout: 3s labels: - "docker.group=netxtcloud" + - "diun.enable=true" # adminer: @@ -158,6 +161,7 @@ services: # - "traefik.http.routers.adminer.middlewares=adminerauth" # - "traefik.http.middlewares.adminerauth.basicauth.users=${HTPASSWD_ADMINER}" # - "docker.group=netxtcloud" +# - "diun.enable=true" redis: @@ -175,6 +179,7 @@ services: timeout: 3s labels: - "docker.group=netxtcloud" + - "diun.enable=true" collabora: @@ -203,6 +208,7 @@ services: - "traefik.http.routers.collabora.tls.options=intermediate@file" - "traefik.http.services.collabora.loadbalancer.server.port=9980" - "docker.group=netxtcloud" + - "diun.enable=true" drawio-export: @@ -216,6 +222,7 @@ services: restart: unless-stopped labels: - "docker.group=netxtcloud" + - "diun.enable=false" # not enabled becaus of spamming :) drawio: @@ -245,6 +252,7 @@ services: - "traefik.http.routers.drawio.tls.options=intermediate@file" - "traefik.http.services.drawio.loadbalancer.server.port=8080" - "docker.group=netxtcloud" + - "diun.enable=false" # not enabled becaus of spamming :) networks: web: diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index 96aff0c..5972c7d 100755 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -59,6 +59,7 @@ services: - "traefik.http.routers.dashboard.middlewares=auth" - "traefik.http.middlewares.auth.basicauth.users=${HTPASSWD}" - "docker.group=proxy" + - "diun.enable=true" docker-socket-proxy: image: tecnativa/docker-socket-proxy @@ -78,6 +79,9 @@ services: interval: 10s timeout: 3s privileged: true + labels: + - "docker.group=proxy" + - "diun.enable=true" # whoami: diff --git a/push/docker-compose.yaml b/push/docker-compose.yaml index a05e51c..4f1936d 100644 --- a/push/docker-compose.yaml +++ b/push/docker-compose.yaml @@ -32,6 +32,7 @@ services: - "traefik.http.routers.push.tls.options=intermediate@file" - "traefik.http.services.push.loadbalancer.server.port=80" - "docker.group=push" + - "diun.enable=true" networks: push: diff --git a/rustdesk/docker-compose.yml b/rustdesk/docker-compose.yml index 959ae77..182db1e 100644 --- a/rustdesk/docker-compose.yml +++ b/rustdesk/docker-compose.yml @@ -17,6 +17,7 @@ services: restart: unless-stopped labels: - "docker.group=rustdesk" + - "diun.enable=true" hbbr: ports: @@ -31,6 +32,7 @@ services: restart: unless-stopped labels: - "docker.group=rustdesk" + - "diun.enable=true" networks: rustdesk: diff --git a/wallabag/docker-compose.yaml b/wallabag/docker-compose.yaml index 0130a05..32df64f 100644 --- a/wallabag/docker-compose.yaml +++ b/wallabag/docker-compose.yaml @@ -32,6 +32,7 @@ services: - "traefik.http.routers.wallabag.tls.certresolver=netcup" - "traefik.http.routers.wallabag.tls.options=intermediate@file" - "docker.group=wallabag" + - "diun.enable=true" depends_on: - db - redis @@ -47,6 +48,7 @@ services: - /var/dockervolumes/wallabag/db:/var/lib/mysql labels: - "docker.group=wallabag" + - "diun.enable=true" redis: image: redis:7.2.4 @@ -59,6 +61,7 @@ services: timeout: 3s labels: - "docker.group=wallabag" + - "diun.enable=true" networks: diff --git a/www/docker-compose.yaml b/www/docker-compose.yaml index 48dd903..c6e9958 100644 --- a/www/docker-compose.yaml +++ b/www/docker-compose.yaml @@ -27,6 +27,7 @@ services: - "traefik.http.routers.www-secure.tls.certresolver=netcup" - "traefik.http.routers.www-secure.tls.options=intermediate@file" - "docker.group=www" + - "diun.enable=true" networks: web: