Tweaks to workflow.

Merged by Trez.One

.gitea/workflows/pr-cloudflare-docker-deploy.yml

@@ -180,17 +180,32 @@ jobs:
           gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}'
           notification_title: 'GITEA: Cloudflare Setup @ Rinoa'
           notification_message: 'Cloudflare DNS setup completed successfully.'
-  regenerate-readme:
+  regenerate-readme-modified-services:
-    name: Update README
+    name: Update README & Generate List of Modified Services
     runs-on: ubuntu-latest
     needs: [cloudflare-dns-setup]
     outputs:
       pr-pushed: ${{ steps.commit-readme.outputs.pushed }}
+      modified_services: ${{ steps.compare-services.outputs.modified_services }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install yq
         uses: dcarbone/install-yq-action@v1
+      - name: Fetch main branch for comparison
+        run: |
+          git fetch origin main:main
+      - name: Compare services using yq
+        continue-on-error: true
+        id: compare-services
+        run: |
+          current_services=$(yq '.services | to_entries' docker-compose.yml)
+          git show main:docker-compose.yml > main_compose.yml
+          main_services=$(yq '.services | to_entries' main_compose.yml)
+          modified_services_file=$(comm -13 <(echo "$main_services") <(echo "$current_services") > changes_compose.yml)
+          modified_services=${egrep '^  [a-z]' changes.yml | sed -e 's|^  ||g' -e 's|:||g' | sed ':a;N;$!ba;s/\n/ /g'}
+          echo "Modified services: $modified_services"
+          echo "modified_services=$modified_services" >> $GITHUB_OUTPUT
       - name: Generate service list
         run: |
           yq '.services | to_entries | map({"service": .key, "image": .value.image})' docker-compose.yml > services.yml
@@ -287,11 +302,12 @@ jobs:
         run: |
            vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
       - name: Docker Compose Deployment
+        if: ${{ steps.regenerate-readme-modified-services.outputs.modified_services != '' }}
         continue-on-error: true
         uses: keatonLiu/docker-compose-remote-action@v1.2
         with:
           docker_compose_file: docker-compose.yml
-          docker_args: -d --remove-orphans --pull missing  --parallel -1
+          docker_args: -d --remove-orphans --pull missing --parallel -1 ${{ steps.regenerate-readme-modified-services.outputs.modified_services }}
           ssh_user: gitea-deploy
           ssh_host: 192.168.1.254
           ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }}

README.md

@@ -16,9 +16,6 @@
 | bitwarden | vaultwarden/server:latest |
 | bluesky-pds | ghcr.io/bluesky-social/pds:latest |
 | browserless | ghcr.io/browserless/chromium:latest |
-| bunkerweb | bunkerity/bunkerweb:latest |
-| bunkerweb-scheduler | bunkerity/bunkerweb-scheduler:latest |
-| bunkerweb-ui | bunkerity/bunkerweb-ui:latest |
 | castopod | castopod/castopod:latest |
 | cloudflared | cloudflare/cloudflared:latest |
 | cloudflareddns | ghcr.io/hotio/cloudflareddns:latest |
@@ -95,7 +92,7 @@
 | netbird-coturn | coturn/coturn:latest |
 | netbox | lscr.io/linuxserver/netbox:latest |
 | netbox-db | postgres:17-alpine |
-| nextcloud | lscr.io/linuxserver/nextcloud:latest |
+| nextcloud | nextcloud/all-in-one:latest |
 | ollama | ollama/ollama |
 | ombi | lscr.io/linuxserver/ombi:latest |
 | paperless-ngx | ghcr.io/paperless-ngx/paperless-ngx:latest |
@@ -147,10 +144,10 @@
 | wallabag | wallabag/wallabag |
 | wallos | bellamy/wallos:latest |
 | watchtower | ghcr.io/containrrr/watchtower:latest |
-| wazuh.agent | opennix/wazuh-agent:latest |
+| wazuh-agent | kennyopennix/wazuh-agent:latest |
-| wazuh.dashboard | wazuh/wazuh-dashboard: |
+| wazuh-dashboard | wazuh/wazuh-dashboard: |
-| wazuh.indexer | wazuh/wazuh-indexer: |
+| wazuh-indexer | wazuh/wazuh-indexer: |
-| wazuh.manager | wazuh/wazuh-manager: |
+| wazuh-manager | wazuh/wazuh-manager: |
 | web-check | lissy93/web-check |
 | your_spotify | lscr.io/linuxserver/your_spotify:latest |
 | youtubedl | nbr23/youtube-dl-server:latest |

docker-compose.yml

@@ -10,6 +10,8 @@ networks:
     name: compose_bitmagnet
   default:
     name: compose_default
+  nextcloud-aio:
+    external: true
 services:
   actual_server:
     container_name: actualbudget
@@ -520,63 +522,6 @@ services:
     networks:
       default: null
     restart: unless-stopped
-  bunkerweb:
-    container_name: bunkerweb
-    environment:
-      API_WHITELIST_IP: 172.18.0.0/16 192.168.1.0/24
-      REAL_IP_FROM: 172.18.0.0/16
-      REAL_IP_HEADER: X-Forwarded-For
-      REVERSE_PROXY_HOST: http://swag:80
-      SERVER_NAME: bunker.trez.wtf
-      USE_REAL_IP: yes
-      USE_REVERSE_PROXY: yes
-    expose:
-      - 8080
-      - 8443
-    image: bunkerity/bunkerweb:latest
-    labels:
-      bunkerweb.INSTANCE: yes
-    restart: unless-stopped
-  bunkerweb-scheduler:
-    container_name: bunkerweb-scheduler
-    depends_on:
-      - bunkerweb
-      - docker-socket-proxy
-    environment:
-      DOCKER_HOST: tcp://dockerproxy:2375
-    image: bunkerity/bunkerweb-scheduler:latest
-    restart: unless-stopped
-    volumes:
-      - bunkerweb-data:/data
-  bunkerweb-ui:
-    container_name: bunkerweb-ui
-    depends_on:
-      bunkerweb:
-        condition: service_started
-        required: true
-        restart: true
-      docker-socket-proxy:
-        condition: service_started
-        required: true
-    environment:
-      DOCKER_HOST: tcp://dockerproxy:2375
-    expose:
-      - 7000
-    image: bunkerity/bunkerweb-ui:latest
-    labels:
-      homepage.group: Privacy/Security
-      homepage.name: Bunker Web
-      homepage.href: https://bunker.${MY_TLD}
-      homepage.icon: bunkerweb.svg
-      homepage.description: Next-gen WAF
-      swag: enable
-      swag_port: 7000
-      swag_url: bunker.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://bunker.${MY_TLD}
-    restart: unless-stopped
-    volumes:
-      - bunkerweb-data:/data
   castopod:
     container_name: castopod
     depends_on:
@@ -796,58 +741,6 @@ services:
         type: bind
         bind:
           create_host_path: true
-  dagu-scheduler:
-    command: dagu scheduler
-    container_name: dagu-scheduler
-    image: ghcr.io/dagu-org/dagu:latest
-    networks:
-      default: null
-    restart: unless-stopped
-    volumes:
-      - source: dagu_config
-        target: /home/dagu/.config/dagu
-        type: volume
-        volume: {}
-      - source: dagu_data
-        target: /home/dagu/.local/share
-        type: volume
-        volume: {}
-  dagu-server:
-    container_name: dagu-server
-    environment:
-      DAGU_PORT: 8080
-    image: ghcr.io/dagu-org/dagu:latest
-    labels:
-      homepage.group: System Administration
-      homepage.name: Dagu
-      homepage.href: https://cron.${MY_TLD}
-      homepage.icon: sh-dagu.png
-      homepage.description: Cron alternative using DAGs (Directed Acyclic Graphs)
-      swag: enable
-      swag_port: 8080
-      swag_proto: http
-      swag_url: cron.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://cron.${MY_TLD}
-    networks:
-      default: null
-    ports:
-      - mode: ingress
-        protocol: tcp
-        published: "8108"
-        target: 8080
-    restart: unless-stopped
-    volumes:
-      - source: dagu_config
-        target: /home/dagu/.config/dagu
-        type: volume
-        bind:
-          create_host_path: true
-      - source: dagu_data
-        target: /home/dagu/.local/share
-        type: volume
-        bind:
-          create_host_path: true
   dbgate:
     container_name: dbgate
     environment:
@@ -1901,11 +1794,11 @@ services:
       DB_USERNAME: hortusfox
     image: ghcr.io/danielbrendel/hortusfox-web:latest
     labels:
-      homepage: enable
+      swag: enable
-      homepage_proto: http
+      swag_proto: http
-      homepage_url: plants.${MY_TLD}
+      swag_url: plants.${MY_TLD}
-      homepage.uptime-kuma.enabled: true
+      swag.uptime-kuma.enabled: true
-      homepage.uptime-kuma.monitor.url: https://plants.${MY_TLD}
+      swag.uptime-kuma.monitor.url: https://plants.${MY_TLD}
       homepage.group: Lifestyle
       homepage.name: HortusFox
       homepage.href: https://plants.${MY_TLD}
@@ -1994,6 +1887,29 @@ services:
     healthcheck:
       disable: false
     image: ghcr.io/immich-app/immich-server:release
+    labels:
+      swag: enable
+      swag_proto: http
+      swag_port: 2283
+      swag_url: pics.${MY_TLD}
+      swag_server_custom_directive: |
+        location /share {
+              proxy_pass http://immich-public-proxy:3000;
+        }
+        location /tools {
+              proxy_pass http://immich-power-tools:3000;
+        }
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://pics.${MY_TLD}
+      homepage.group: Media Library
+      homepage.name: Immich
+      homepage.href: https://pics.${MY_TLD}
+      homepage.icon: immich.svg
+      homepage.description: High performance self-hosted photo and video management solution
+      homepage.widget.type: immich
+      homepage.widget.url: http://immich-server:2283
+      homepage.widget.key: ${IMMICH_POWER_TOOLS_KEY}
+      homepage.widget.version: 2
     ports:
       - 2283:2283
     restart: always
@@ -2059,27 +1975,37 @@ services:
       timeout: 5s
     image: alangrainger/immich-public-proxy:latest
     labels:
-      homepage: enable
-      homepage_proto: http
-      homepage_port: 3000
-      homepage_url: pics.${MY_TLD}
-      homepage.uptime-kuma.enabled: true
-      homepage.uptime-kuma.monitor.url: https://pics.${MY_TLD}
       homepage.group: Lifestyle
-      homepage.name: Immich
+      homepage.name: Immich Public Proxy
-      homepage.href: https://pics.${MY_TLD}
+      homepage.href: https://pics.${MY_TLD}/share
-      homepage.icon: immich.svg
+      homepage.icon: sh-immich-public-proxy.svg
-      homepage.description: High performance self-hosted photo and video management solution
+      homepage.description: Immich Proxy for public sharing
+      homepage.widget.type: immich
+      homepage.widget.url: http://immich-server:2283
+      homepage.widget.key: ${IMMICH_POWER_TOOLS_KEY}
+      homepage.widget.version: 2
     restart: always
   immich-power-tools:
     container_name: immich-power-tools
     environment:
+      DB_DATABASE_NAME: immich
+      DB_HOSTNAME: immich-pg-db
+      DB_PORT: 5432
+      DB_USERNAME: immich
+      DB_PASSWORD: ${IMMICH_DB_PASSWORD}
+      EXTERNAL_IMMICH_URL: https://pics.trez.wtf
       IMMICH_API_KEY: ${IMMICH_POWER_TOOLS_KEY}
       IMMICH_URL: http://immich-server:2283
-      EXTERNAL_IMMICH_URL: https://pics.trez.wtf
     image: ghcr.io/varun-raj/immich-power-tools:latest
+    labels:
+      homepage.group: Lifestyle
+      homepage.name: Immich Public Proxy
+      homepage.href: https://pics.${MY_TLD}/tools
+      homepage.icon: sh-immich-power-tools.png
+      homepage.description: Tools for Immich
     ports:
       - 54018:3000
+    restart: unless-stopped
   influxdb2:
     container_name: influxdb2
     environment:
@@ -2091,19 +2017,20 @@ services:
       DOCKER_INFLUXDB_INIT_BUCKET: rinoa
     image: influxdb:2-alpine
     labels:
-      homepage: enable
+      swag: enable
-      homepage_proto: http
+      swag_proto: http
-      homepage_port: 8086
+      swag_port: 8086
-      homepage_url: influxdb.${MY_TLD}
+      swag_url: influxdb.${MY_TLD}
-      homepage.uptime-kuma.enabled: true
+      swag.uptime-kuma.enabled: true
-      homepage.uptime-kuma.monitor.url: https://influxdb.${MY_TLD}
+      swag.uptime-kuma.monitor.url: https://influxdb.${MY_TLD}
       homepage.group: System Administration
       homepage.name: InfluxDBv2
-      homepage.href: https://invid.${MY_TLD}
+      homepage.href: https://influxdb.${MY_TLD}
       homepage.icon: influxdb.svg
       homepage.description: Scalable datastore for metrics, events, and real-time analytics
     ports:
       - 8086:8086
+    restart: unless-stopped
     volumes:
       - influxdb2-data:/var/lib/influxdb2
       - influxdb2-config:/etc/influxdb2
@@ -2134,12 +2061,12 @@ services:
       timeout: 5s
     image: quay.io/invidious/invidious:latest
     labels:
-      homepage: enable
+      swag: enable
-      homepage_proto: http
+      swag_proto: http
-      homepage_port: 3000
+      swag_port: 3000
-      homepage_url: invid.${MY_TLD}
+      swag_url: invid.${MY_TLD}
-      homepage.uptime-kuma.enabled: true
+      swag.uptime-kuma.enabled: true
-      homepage.uptime-kuma.monitor.url: https://invid.${MY_TLD}
+      swag.uptime-kuma.monitor.url: https://invid.${MY_TLD}
       homepage.group: Social
       homepage.name: Invidious
       homepage.href: https://invid.${MY_TLD}
@@ -2182,8 +2109,8 @@ services:
         type: bind
         bind:
           create_host_path: true
-  invoice_ninja:
+  invoice-ninja:
-    container_name: invoice_ninja
+    container_name: invoice-ninja
     depends_on:
       mariadb:
         condition: service_started
@@ -2219,7 +2146,7 @@ services:
       TRUSTED_PROXIES: 172.18.0.0/16
     expose:
       - 9000
-    image: invoiceninja/invoiceninja:5
+    image: invoiceninja/invoiceninja-debian:5
     networks:
       default: null
     ports:
@@ -2229,32 +2156,17 @@ services:
         target: 8003
     restart: always
     volumes:
-      - source: ${DOCKER_VOLUME_CONFIG}/invoice-ninja/app/public
+      - ${DOCKER_VOLUME_CONFIG}/invoice-ninja/invoice-ninja.env:/var/www/html/.env
-        target: /var/www/app/public
+      - invoice-ninja_cache:/var/www/html/bootstrap/cache
-        type: bind
+      - invoice-ninja_public:/var/www/html/public
-        bind:
+      - invoice-ninja_storage:/var/www/html/storage
-          create_host_path: true
+  invoice-ninja_proxy:
-      - source: ${DOCKER_VOLUME_CONFIG}/invoice-ninja/app/storage
+    container_name: invoice-ninja_proxy
-        target: /var/www/app/storage
-        type: bind
-        bind:
-          create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/invoice-ninja/php/php.ini
-        target: /usr/local/etc/php/php.ini
-        type: bind
-        bind:
-          create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/invoice-ninja/php/php-cli.ini
-        target: /usr/local/etc/php/php-cli.ini
-        type: bind
-        bind:
-          create_host_path: true
-  invoice_ninja_proxy:
-    container_name: invoice_ninja_proxy
     depends_on:
-      invoice_ninja:
+      invoice-ninja:
         condition: service_started
         required: true
+        restart: true
     environment:
       APP_DEBUG: true
       APP_KEY: ${IN_APP_KEY}
@@ -3253,7 +3165,6 @@ services:
       PGID: 1000
       PUID: 1000
       TZ: America/New_York
-      MYSQL_PASSWORD: ${NEXTCLOUD_MARIADB_PASSWORD}
     hostname: Rinoa
     image: linuxserver/mariadb
     networks:
@@ -3716,13 +3627,46 @@ services:
         target: /var/lib/postgresql/data
         type: volume
         volume: {}
-  nextcloud:
+  netdata:
-    container_name: nextcloud
+    cap_add:
+      - SYS_PTRACE
+      - SYS_ADMIN
+    container_name: netdata
     environment:
       DOCKER_HOST: tcp://dockerproxy:2375
-      LOG_LEVEL: debug
+    image: netdata/netdata:stable
+    labels:
+      homepage.widget.type: netdata
+      homepage.widget.url: http://netdata:19999
+      swag: enable
+      swag_port: 19999
+      swag_proto: http
+      swag_url: netdata.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://netdata.${MY_TLD}
+    pid: host
+    ports:
+      - 19999:19999
+    restart: unless-stopped
+    security_opt:
+      - apparmor:unconfined
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/netdata:/etc/netdata
+      - netdata-lib:/var/lib/netdata
+      - netdata-cache:/var/cache/netdata
+      - /:/host/root:ro,rslave
+      - /etc/passwd:/host/etc/passwd:ro
+      - /etc/group:/host/etc/group:ro
+      - /etc/localtime:/etc/localtime:ro
+      - /proc:/host/proc:ro
+      - /sys:/host/sys:ro
+      - /etc/os-release:/host/etc/os-release:ro
+      - /var/log:/host/var/log:ro
+  nextcloud:
+    container_name: nextcloud-aio-mastercontainer
+    environment:
       SKIP_DOMAIN_VALIDATION: false
-      APACHE_ADDITIONAL_NETWORK: 
+      APACHE_ADDITIONAL_NETWORK: compose_default
       APACHE_IP_BINDING: 0.0.0.0
       APACHE_PORT: 11000
     expose:
@@ -3736,7 +3680,8 @@ services:
       homepage.description: Private Cloud
       swag: enable
       swag_port: 11000
-      swag_proto: https
+      swag_proto: http
+      swag_address: nextcloud-aio-apache
       swag_url: cloud.${MY_TLD}
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://cloud.${MY_TLD}
@@ -3744,9 +3689,8 @@ services:
       - 56713:8080
     restart: unless-stopped
     volumes:
-      - /etc/localtime:/etc/localtime:ro
+      - /var/run/docker.sock:/var/run/docker.sock
-      - ${DOCKER_VOLUME_CONFIG}/nextcloud/config:/config
+      - nextcloud_aio_mastercontainer:/mnt/docker-aio-config
-      - ${DOCKER_VOLUME_CONFIG}/nextcloud/data:/data
   ollama:
     container_name: ollama
     image: ollama/ollama
@@ -4015,6 +3959,10 @@ services:
       homepage.href: https://portainer.${MY_TLD}
       homepage.icon: portainer.svg
       homepage.description: Service delivery platform for containerized applications
+      homepage.widget.type: portainer
+      homepage.widget.url: http://portainer:9000
+      homepage.widget.env: 20
+      homepage.widget.key: ${PORTAINER_HOMEPAGE_TOKEN}
     restart: unless-stopped
     volumes:
         - portainer-data:/data
@@ -4863,7 +4811,7 @@ services:
       homepage.group: Servarr Stack
       homepage.name: Sonashow
       homepage.href: https://sonashow.${MY_TLD}
-      homepage.icon: /icons/sonashow.png
+      homepage.icon: sh-sonashow.png
       homepage.description: TV show discovery based on library/tastes
       swag: enable
       swag_auth: authelia
@@ -5059,7 +5007,8 @@ services:
       homepage.widget.type: swagdashboard
       homepage.widget.url: http://swag:81
     networks:
-      default: null
+      - default
+      - nextcloud-aio
     ports:
       - mode: ingress
         protocol: tcp
@@ -6678,267 +6627,267 @@ services:
         source: /var/run/docker.sock
         target: /var/run/docker.sock
         type: bind
-  wazuh.agent:
+  # wazuh-agent:
-    container_name: wazuh.agent
+  #   container_name: wazuh.agent
-    environment:
+  #   environment:
-      JOIN_MANAGER_PROTOCOL: https
+  #     JOIN_MANAGER_PROTOCOL: https
-      JOIN_MANAGER_MASTER_HOST: wazuh.manager
+  #     JOIN_MANAGER_MASTER_HOST: wazuh.manager
-      JOIN_MANAGER_WORKER_HOST: wazuh.manager
+  #     JOIN_MANAGER_WORKER_HOST: wazuh.manager
-      JOIN_MANAGER_USER: wazuh-wui
+  #     JOIN_MANAGER_USER: wazuh-wui
-      JOIN_MANAGER_PASSWORD: ${WAZUH_API_PASSWORD}
+  #     JOIN_MANAGER_PASSWORD: ${WAZUH_API_PASSWORD}
-      JOIN_MANAGER_API_PORT: 55000
+  #     JOIN_MANAGER_API_PORT: 55000
-      JOIN_MANAGER_PORT: 1514
+  #     JOIN_MANAGER_PORT: 1514
-      VIRUS_TOTAL_KEY: ${VIRUS_TOTAL_API_KEY}
+  #     VIRUS_TOTAL_KEY: ${VIRUS_TOTAL_API_KEY}
-      DOCKER_HOST: tcp://dockerproxy:2375
+  #     DOCKER_HOST: tcp://dockerproxy:2375
-    hostname: wazuh.agent
+  #   hostname: wazuh.agent
-    image: opennix/wazuh-agent:latest
+  #   image: kennyopennix/wazuh-agent:latest
-    networks:
+  #   networks:
-      default: null
+  #     default: null
-    restart: unless-stopped
+  #   restart: unless-stopped
-  wazuh.dashboard:
+  # wazuh-dashboard:
-    container_name: wazuh.dashboard
+  #   container_name: wazuh-dashboard
-    depends_on:
+  #   depends_on:
-      wazuh.indexer:
+  #     wazuh-indexer:
-        condition: service_started
+  #       condition: service_started
-        required: true
+  #       required: true
-      wazuh.manager:
+  #     wazuh-manager:
-        condition: service_started
+  #       condition: service_started
-        required: true
+  #       required: true
-        restart: true
+  #       restart: true
-    environment:
+  #   environment:
-      INDEXER_USERNAME: admin
+  #     INDEXER_USERNAME: admin
-      INDEXER_PASSWORD: ${WAZUH_INDEXER_PASSWORD}
+  #     INDEXER_PASSWORD: ${WAZUH_INDEXER_PASSWORD}
-      WAZUH_API_URL: https://wazuh.manager
+  #     WAZUH_API_URL: https://wazuh.manager
-      DASHBOARD_USERNAME: kibanaserver
+  #     DASHBOARD_USERNAME: kibanaserver
-      DASHBOARD_PASSWORD: ${WAZUH_KIBANA_PASSWORD}
+  #     DASHBOARD_PASSWORD: ${WAZUH_KIBANA_PASSWORD}
-      API_USERNAME: wazuh-wui
+  #     API_USERNAME: wazuh-wui
-      API_PASSWORD: ${WAZUH_API_PASSWORD}
+  #     API_PASSWORD: ${WAZUH_API_PASSWORD}
-    hostname: wazuh.dashboard
+  #   hostname: wazuh-dashboard
-    image: wazuh/wazuh-dashboard:${WAZUH_VERSION}
+  #   image: wazuh/wazuh-dashboard:${WAZUH_VERSION}
-    labels:
+  #   labels:
-      swag: enable
+  #     swag: enable
-      swag_proto: https
+  #     swag_proto: https
-      swag_port: 5601
+  #     swag_port: 5601
-      swag_url: wsec.${MY_TLD}
+  #     swag_url: wsec.${MY_TLD}
-      swag.uptime-kuma.enabled: true
+  #     swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://wsec.${MY_TLD}
+  #     swag.uptime-kuma.monitor.url: https://wsec.${MY_TLD}
-      homepage.group: Privacy/Security
+  #     homepage.group: Privacy/Security
-      homepage.name: Wazuh
+  #     homepage.name: Wazuh
-      homepage.href: https://wsec.${MY_TLD}
+  #     homepage.href: https://wsec.${MY_TLD}
-      homepage.icon: wazuh.svg
+  #     homepage.icon: wazuh.svg
-      homepage.description: OSS Security Platform for XDR/SIEM
+  #     homepage.description: OSS Security Platform for XDR/SIEM
-    links:
+  #   links:
-      - wazuh.indexer:wazuh.indexer
+  #     - wazuh-indexer:wazuh-indexer
-      - wazuh.manager:wazuh.manager
+  #     - wazuh-manager:wazuh-manager
-    networks:
+  #   networks:
-      default: null
+  #     default: null
-    ports:
+  #   ports:
-      - mode: ingress
+  #     - mode: ingress
-        protocol: tcp
+  #       protocol: tcp
-        published: "5601"
+  #       published: "5601"
-        target: 5601
+  #       target: 5601
-    restart: always
+  #   restart: always
-    volumes:
+  #   volumes:
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/certs/wazuh.dashboard.pem
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.dashboard.pem
-        target: /usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem
+  #       target: /usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/certs/wazuh.dashboard-key.pem
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.dashboard-key.pem
-        target: /usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem
+  #       target: /usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/certs/root-ca.pem
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/root-ca.pem
-        target: /usr/share/wazuh-dashboard/certs/root-ca.pem
+  #       target: /usr/share/wazuh-dashboard/certs/root-ca.pem
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/config/opensearch_dashboards.yml
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/opensearch_dashboards.yml
-        target: /usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
+  #       target: /usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/config/wazuh.yml
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/dashboard/wazuh.yml
-        target: /usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml
+  #       target: /usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: wazuh-dashboard-config
+  #     - source: wazuh-dashboard-config
-        target: /usr/share/wazuh-dashboard/data/wazuh/config
+  #       target: /usr/share/wazuh-dashboard/data/wazuh/config
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: wazuh-dashboard-custom
+  #     - source: wazuh-dashboard-custom
-        target: /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
+  #       target: /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-  wazuh.indexer:
+  # wazuh-indexer:
-    container_name: wazuh.indexer
+  #   container_name: wazuh-indexer
-    environment:
+  #   environment:
-      OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
+  #     OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
-    hostname: wazuh.indexer
+  #   hostname: wazuh-indexer
-    image: wazuh/wazuh-indexer:${WAZUH_VERSION}
+  #   image: wazuh/wazuh-indexer:${WAZUH_VERSION}
-    networks:
+  #   networks:
-      default: null
+  #     default: null
-    ports:
+  #   ports:
-      - mode: ingress
+  #     - mode: ingress
-        protocol: tcp
+  #       protocol: tcp
-        published: "9200"
+  #       published: "9200"
-        target: 9200
+  #       target: 9200
-    restart: always
+  #   restart: always
-    ulimits:
+  #   ulimits:
-      memlock:
+  #     memlock:
-        hard: -1
+  #       hard: -1
-        soft: -1
+  #       soft: -1
-      nofile:
+  #     nofile:
-        hard: 65536
+  #       hard: 65536
-        soft: 65536
+  #       soft: 65536
-    volumes:
+  #   volumes:
-      - source: wazuh-indexer-data
+  #     - source: wazuh-indexer-data
-        target: /var/lib/wazuh-indexer
+  #       target: /var/lib/wazuh-indexer
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/certs/root-ca.pem
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/root-ca.pem
-        target: /usr/share/wazuh-indexer/certs/root-ca.pem
+  #       target: /usr/share/wazuh-indexer/certs/root-ca.pem
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/certs/wazuh.indexer-key.pem
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.indexer-key.pem
-        target: /usr/share/wazuh-indexer/certs/wazuh.indexer.key
+  #       target: /usr/share/wazuh-indexer/certs/wazuh.indexer.key
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/certs/wazuh.indexer.pem
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.indexer.pem
-        target: /usr/share/wazuh-indexer/certs/wazuh.indexer.pem
+  #       target: /usr/share/wazuh-indexer/certs/wazuh.indexer.pem
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/certs/admin.pem
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/admin.pem
-        target: /usr/share/wazuh-indexer/certs/admin.pem
+  #       target: /usr/share/wazuh-indexer/certs/admin.pem
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/certs/admin-key.pem
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/admin-key.pem
-        target: /usr/share/wazuh-indexer/certs/admin-key.pem
+  #       target: /usr/share/wazuh-indexer/certs/admin-key.pem
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/config/wazuh.indexer.yml
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/wazuh.indexer.yml
-        target: /usr/share/wazuh-indexer/opensearch.yml
+  #       target: /usr/share/wazuh-indexer/opensearch.yml
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/config/internal_users.yml
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/indexer/internal_users.yml
-        target: /usr/share/wazuh-indexer/opensearch-security/internal_users.yml
+  #       target: /usr/share/wazuh-indexer/opensearch-security/internal_users.yml
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-  wazuh.manager:
+  # wazuh-manager:
-    container_name: wazuh.manager
+  #   container_name: wazuh-manager
-    environment:
+  #   environment:
-      INDEXER_URL: https://wazuh.indexer:9200
+  #     INDEXER_URL: https://wazuh.indexer:9200
-      INDEXER_USERNAME: admin
+  #     INDEXER_USERNAME: admin
-      INDEXER_PASSWORD: ${WAZUH_INDEXER_PASSWORD}
+  #     INDEXER_PASSWORD: ${WAZUH_INDEXER_PASSWORD}
-      FILEBEAT_SSL_VERIFICATION_MODE: full
+  #     FILEBEAT_SSL_VERIFICATION_MODE: full
-      SSL_CERTIFICATE_AUTHORITIES: /etc/ssl/root-ca.pem
+  #     SSL_CERTIFICATE_AUTHORITIES: /etc/ssl/root-ca.pem
-      SSL_CERTIFICATE: /etc/ssl/filebeat.pem
+  #     SSL_CERTIFICATE: /etc/ssl/filebeat.pem
-      SSL_KEY: /etc/ssl/filebeat.key
+  #     SSL_KEY: /etc/ssl/filebeat.key
-      API_USERNAME: wazuh-wui
+  #     API_USERNAME: wazuh-wui
-      API_PASSWORD: ${WAZUH_API_PASSWORD}
+  #     API_PASSWORD: ${WAZUH_API_PASSWORD}
-    hostname: wazuh.manager
+  #   hostname: wazuh-manager
-    image: wazuh/wazuh-manager:${WAZUH_VERSION}
+  #   image: wazuh/wazuh-manager:${WAZUH_VERSION}
-    networks:
+  #   networks:
-      default: null
+  #     default: null
-    ports:
+  #   ports:
-      - mode: ingress
+  #     - mode: ingress
-        protocol: tcp
+  #       protocol: tcp
-        published: "1514"
+  #       published: "1514"
-        target: 1514
+  #       target: 1514
-      - mode: ingress
+  #     - mode: ingress
-        protocol: tcp
+  #       protocol: tcp
-        published: "1515"
+  #       published: "1515"
-        target: 1515
+  #       target: 1515
-      - mode: ingress
+  #     - mode: ingress
-        protocol: udp
+  #       protocol: udp
-        published: "514"
+  #       published: "514"
-        target: 514
+  #       target: 514
-      - mode: ingress
+  #     - mode: ingress
-        protocol: tcp
+  #       protocol: tcp
-        published: "55000"
+  #       published: "55000"
-        target: 55000
+  #       target: 55000
-    restart: always
+  #   restart: always
-    ulimits:
+  #   ulimits:
-      memlock:
+  #     memlock:
-        hard: -1
+  #       hard: -1
-        soft: -1
+  #       soft: -1
-      nofile:
+  #     nofile:
-        hard: 655360
+  #       hard: 655360
-        soft: 655360
+  #       soft: 655360
-    volumes:
+  #   volumes:
-      - source: wazuh_api_configuration
+  #     - source: wazuh_api_configuration
-        target: /var/ossec/api/configuration
+  #       target: /var/ossec/api/configuration
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: wazuh_etc
+  #     - source: wazuh_etc
-        target: /var/ossec/etc
+  #       target: /var/ossec/etc
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: wazuh_logs
+  #     - source: wazuh_logs
-        target: /var/ossec/logs
+  #       target: /var/ossec/logs
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: wazuh_queue
+  #     - source: wazuh_queue
-        target: /var/ossec/queue
+  #       target: /var/ossec/queue
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: wazuh_var_multigroups
+  #     - source: wazuh_var_multigroups
-        target: /var/ossec/var/multigroups
+  #       target: /var/ossec/var/multigroups
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: wazuh_integrations
+  #     - source: wazuh_integrations
-        target: /var/ossec/integrations
+  #       target: /var/ossec/integrations
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: wazuh_active_response
+  #     - source: wazuh_active_response
-        target: /var/ossec/active-response/bin
+  #       target: /var/ossec/active-response/bin
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: wazuh_agentless
+  #     - source: wazuh_agentless
-        target: /var/ossec/agentless
+  #       target: /var/ossec/agentless
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: wazuh_wodles
+  #     - source: wazuh_wodles
-        target: /var/ossec/wodles
+  #       target: /var/ossec/wodles
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: filebeat_etc
+  #     - source: filebeat_etc
-        target: /etc/filebeat
+  #       target: /etc/filebeat
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: filebeat_var
+  #     - source: filebeat_var
-        target: /var/lib/filebeat
+  #       target: /var/lib/filebeat
-        type: volume
+  #       type: volume
-        volume: {}
+  #       volume: {}
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/manager/certs/root-ca.pem
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/root-ca.pem
-        target: /etc/ssl/root-ca.pem
+  #       target: /etc/ssl/root-ca.pem
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/manager/certs/wazuh.manager.pem
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.manager.pem
-        target: /etc/ssl/filebeat.pem
+  #       target: /etc/ssl/filebeat.pem
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/manager/certs/wazuh.manager-key.pem
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/generator/wazuh.manager-key.pem
-        target: /etc/ssl/filebeat.key
+  #       target: /etc/ssl/filebeat.key
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
-      - source: ${DOCKER_VOLUME_CONFIG}/wazuh/manager/config/wazuh_manager.conf
+  #     - source: ${DOCKER_VOLUME_CONFIG}/wazuh/manager/wazuh_manager.conf
-        target: /wazuh-config-mount/etc/ossec.conf
+  #       target: /wazuh-config-mount/etc/ossec.conf
-        type: bind
+  #       type: bind
-        bind:
+  #       bind:
-          create_host_path: true
+  #         create_host_path: true
   web-check:
     container_name: web-check
     image: lissy93/web-check
@@ -7494,8 +7443,12 @@ volumes:
     name: influxdb2-config
   invidious-postgres:
     name: invidious-postgres
-  invoice_ninja_public:
+  invoice-ninja_cache:
-    name: invoice_ninja_public
+    name: invoice-ninja_cache
+  invoice-ninja_public:
+    name: invoice-ninja_public
+  invoice-ninja_storage:
+    name: invoice-ninja_storage
   jitsi-web-admin-theme:
     name: jitsi-web-admin-theme
   jitsi-web-admin-upload:
@@ -7522,6 +7475,12 @@ volumes:
     name: netbird-letsencrypt
   netbox-pg-db:
     name: netbox-pg-db
+  netdata-cache:
+    name: netdata-cache
+  netdata-lib:
+    name: netdata-lib
+  nextcloud_aio_mastercontainer:
+    name: nextcloud_aio_mastercontainer
   ollama:
     name: ollama
   paperless-ngx-data: