Adding step for detecting modified services in Compose file.

Merged by Trez.One

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

@@ -286,15 +286,29 @@ jobs:
       - name: Generate .env file for deployment
         run: |
            vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
+      - name: Detect modified services
+        id: detect-modified-services
+        run: |
+          git diff --name-only HEAD^ HEAD | grep docker-compose.yml > /dev/null
+          if [ $? -eq 0 ]; then
+            modified_services=$(git diff HEAD^ HEAD -- docker-compose.yml | grep -E '^\+[[:space:]]+[a-zA-Z0-9_-]+:' | sed -E 's/^\+[[:space:]]+([a-zA-Z0-9_-]+):.*/\1/')
+            echo "Modified services: $modified_services"
+            echo "modified_services=$modified_services" >> $GITHUB_OUTPUT
+          else
+            echo "No changes in docker-compose.yml"
+            echo "modified_services=" >> $GITHUB_OUTPUT
+          fi
       - name: Docker Compose Deployment
+        if: ${{ steps.detect-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
           ssh_user: gitea-deploy
           ssh_host: 192.168.1.254
           ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }}
           ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }}
-          docker_compose_file: docker-compose.yml
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
         with:

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 |
@@ -53,6 +50,12 @@
 | homepage | ghcr.io/gethomepage/homepage:latest |
 | hortusfox | ghcr.io/danielbrendel/hortusfox-web:latest |
 | hugo | hugomods/hugo:exts |
+| immich-server | ghcr.io/immich-app/immich-server:release |
+| immich-machine-learning | ghcr.io/immich-app/immich-machine-learning:release |
+| immich-pg-db | tensorchord/pgvecto-rs:pg14-v0.2.1 |
+| immich-public-proxy | alangrainger/immich-public-proxy:latest |
+| immich-power-tools | ghcr.io/varun-raj/immich-power-tools:latest |
+| influxdb2 | influxdb:2-alpine |
 | invidious | quay.io/invidious/invidious:latest |
 | invidious-db | docker.io/library/postgres:14 |
 | invoice_ninja | invoiceninja/invoiceninja:5 |
@@ -89,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 |
@@ -141,12 +144,11 @@
 | wallabag | wallabag/wallabag |
 | wallos | bellamy/wallos:latest |
 | watchtower | ghcr.io/containrrr/watchtower:latest |
-| wazuh.agent | opennix/wazuh-agent:latest |
-| wazuh.dashboard | wazuh/wazuh-dashboard: |
-| wazuh.indexer | wazuh/wazuh-indexer: |
-| wazuh.manager | wazuh/wazuh-manager: |
+| wazuh-agent | kennyopennix/wazuh-agent:latest |
+| wazuh-dashboard | wazuh/wazuh-dashboard: |
+| wazuh-indexer | wazuh/wazuh-indexer: |
+| wazuh-manager | wazuh/wazuh-manager: |
 | web-check | lissy93/web-check |
-| yacht | selfhostedpro/yacht |
 | your_spotify | lscr.io/linuxserver/your_spotify:latest |
 | youtubedl | nbr23/youtube-dl-server:latest |
 | zammad-backup | postgres: |

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:
@@ -920,8 +865,8 @@ services:
       ENGINE_mastodon-pg-db: postgres@dbgate-plugin-postgres
 
       LABEL_mongodb: mongodb
-      URI_mongodb: mongodb://mongodb:27017
-      ENGINE_mongodb: mongo@dbgate-plugin-mongo
+      URI_mongodb: mongodb://root:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017
+      ENGINE_mongodb: mongo@dbgate-plugin-mongo-v2
 
       LABEL_netbox-db: netbox-db
       SERVER_netbox-db: netbox-db
@@ -1975,6 +1920,138 @@ services:
         type: bind
         bind:
           create_host_path: true
+  immich-server:
+    container_name: immich-server
+    depends_on:
+      redis:
+        condition: service_started
+        required: true
+      immich-pg-db:
+        condition: service_started
+        required: true
+    environment:
+      DB_DATABASE_NAME: immich
+      DB_HOSTNAME: immich-pg-db
+      DB_PORT: 5432
+      DB_USERNAME: immich
+      DB_PASSWORD: ${IMMICH_DB_PASSWORD}
+      IMMICH_TELEMETRY_INCLUDE: all
+    healthcheck:
+      disable: false
+    image: ghcr.io/immich-app/immich-server:release
+    ports:
+      - 2283:2283
+    restart: always
+    volumes:
+      # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file
+      - ${DOCKER_VOLUME_STORAGE}/Pics:/usr/src/app/upload
+      - /etc/localtime:/etc/localtime:ro
+  immich-machine-learning:
+    container_name: immich-machine-learning
+    depends_on:
+      immich-server:
+        condition: service_started
+        required: true
+    healthcheck:
+      disable: false
+    image: ghcr.io/immich-app/immich-machine-learning:release
+    restart: always
+    volumes:
+      - immich-model-cache:/cache
+  immich-pg-db:
+    command: >-
+      postgres
+      -c shared_preload_libraries=vectors.so
+      -c 'search_path="$$user", public, vectors'
+      -c logging_collector=on
+      -c max_wal_size=2GB
+      -c shared_buffers=512MB
+      -c wal_compression=on
+    container_name: immich-pg-db
+    environment:
+      POSTGRES_PASSWORD: ${IMMICH_DB_PASSWORD}
+      POSTGRES_USER: immich
+      POSTGRES_DB: immich
+    expose:
+      - 5432
+    healthcheck:
+      test: >-
+        pg_isready --dbname="$${POSTGRES_DB}" --username="$${POSTGRES_USER}" || exit 1;
+        Chksum="$$(psql --dbname="$${POSTGRES_DB}" --username="$${POSTGRES_USER}" --tuples-only --no-align
+        --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')";
+        echo "checksum failure count is $$Chksum";
+        [ "$$Chksum" = '0' ] || exit 1
+      interval: 5m
+      start_interval: 30s
+      start_period: 5m
+    image: tensorchord/pgvecto-rs:pg14-v0.2.1
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/immich/db:/var/lib/postgresql/data
+  immich-public-proxy:
+    container_name: immich-public-proxy
+    depends_on:
+      immich-server:
+        condition: service_started
+        required: true
+    environment:
+      IMMICH_URL: http://immich-server:2283
+    expose:
+      - 3000
+    healthcheck:
+      test: wget -q --spider http://localhost:3000/share/healthcheck || exit 1
+      start_period: 10s
+      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.href: https://pics.${MY_TLD}
+      homepage.icon: immich.svg
+      homepage.description: High performance self-hosted photo and video management solution
+    restart: always
+  immich-power-tools:
+    container_name: immich-power-tools
+    environment:
+      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
+    ports:
+      - 54018:3000
+  influxdb2:
+    container_name: influxdb2
+    environment:
+      DOCKER_INFLUXDB_INIT_MODE: setup
+      DOCKER_INFLUXDB_INIT_USERNAME: admin
+      DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB2_ADMIN_PASSWORD}
+      DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: /run/secrets/influxdb2-admin-token
+      DOCKER_INFLUXDB_INIT_ORG: rinoa
+      DOCKER_INFLUXDB_INIT_BUCKET: rinoa
+    image: influxdb:2-alpine
+    labels:
+      homepage: enable
+      homepage_proto: http
+      homepage_port: 8086
+      homepage_url: influxdb.${MY_TLD}
+      homepage.uptime-kuma.enabled: true
+      homepage.uptime-kuma.monitor.url: https://influxdb.${MY_TLD}
+      homepage.group: System Administration
+      homepage.name: InfluxDBv2
+      homepage.href: https://invid.${MY_TLD}
+      homepage.icon: influxdb.svg
+      homepage.description: Scalable datastore for metrics, events, and real-time analytics
+    ports:
+      - 8086:8086
+    volumes:
+      - influxdb2-data:/var/lib/influxdb2
+      - influxdb2-config:/etc/influxdb2
   invidious:
     container_name: invidious
     depends_on:
@@ -2184,72 +2261,6 @@ services:
         type: bind
         bind:
           create_host_path: true
-  immich-server:
-    container_name: immich_server
-    depends_on:
-      redis:
-        condition: service_started
-        required: true
-      immich-pg-db:
-        condition: service_started
-        required: true
-    environment:
-      DB_DATABASE_NAME: immich
-      DB_USERNAME: immich
-      DB_PASSWORD: ${IMMICH_DB_PASSWORD}
-      IMMICH_TELEMETRY_INCLUDE: all
-    healthcheck:
-      disable: false
-    image: ghcr.io/immich-app/immich-server:release
-    ports:
-      - 2283:2283
-    restart: always
-    volumes:
-      # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file
-      - ${DOCKER_VOLUME_STORAGE}/Pics:/usr/src/app/upload
-      - /etc/localtime:/etc/localtime:ro
-  immich-machine-learning:
-    container_name: immich_machine_learning
-    depends_on:
-      immich-server:
-        condition: service_started
-        required: true
-    healthcheck:
-      disable: false
-    image: ghcr.io/immich-app/immich-machine-learning:release
-    restart: always
-    volumes:
-      - immich-model-cache:/cache
-  immich-pg-db:
-    command: >-
-      postgres
-      -c shared_preload_libraries=vectors.so
-      -c 'search_path="$$user", public, vectors'
-      -c logging_collector=on
-      -c max_wal_size=2GB
-      -c shared_buffers=512MB
-      -c wal_compression=on
-    container_name: immich-pg-db
-    environment:
-      POSTGRES_PASSWORD: ${JOPLIN_POSTGRES_PASSWORD}
-      POSTGRES_USER: immich
-      POSTGRES_DB: immich
-    expose:
-      - 5432
-    healthcheck:
-      test: >-
-        pg_isready --dbname="$${POSTGRES_DB}" --username="$${POSTGRES_USER}" || exit 1;
-        Chksum="$$(psql --dbname="$${POSTGRES_DB}" --username="$${POSTGRES_USER}" --tuples-only --no-align
-        --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')";
-        echo "checksum failure count is $$Chksum";
-        [ "$$Chksum" = '0' ] || exit 1
-      interval: 5m
-      start_interval: 30s
-      start_period: 5m
-    image: tensorchord/pgvecto-rs:pg14-v0.2.1
-    restart: unless-stopped
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/immich/db:/var/lib/postgresql/data
   it-tools:
     container_name: it-tools
     image: ghcr.io/corentinth/it-tools:latest
@@ -3187,7 +3198,6 @@ services:
       PGID: 1000
       PUID: 1000
       TZ: America/New_York
-      MYSQL_PASSWORD: ${NEXTCLOUD_MARIADB_PASSWORD}
     hostname: Rinoa
     image: linuxserver/mariadb
     networks:
@@ -3346,7 +3356,7 @@ services:
       ALLOW_EMPTY_PASSWORD: yes
       MONGODB_REPLICA_SET_MODE: primary
       MONGODB_REPLICA_SET_NAME: rinoa
-      MONGODB_REPLICA_SET_KEY: 
+      MONGODB_REPLICA_SET_KEY: ${MONGODB_REPLICA_SET_KEY}
     image: bitnami/mongodb:7.0
     ports:
       - 27017:27017
@@ -3651,60 +3661,34 @@ services:
         type: volume
         volume: {}
   nextcloud:
-    container_name: nextcloud
-    depends_on:
-      mariadb:
-        condition: service_started
-        required: true
-        restart: true
+    container_name: nextcloud-aio-mastercontainer
     environment:
-      PGID: ${PGID}
-      PUID: ${PUID}
-      TZ: ${TZ}
-      LOG_LEVEL: debug
-    hostname: Rinoa
-    image: lscr.io/linuxserver/nextcloud:latest
+      SKIP_DOMAIN_VALIDATION: false
+      APACHE_ADDITIONAL_NETWORK: compose_default
+      APACHE_IP_BINDING: 0.0.0.0
+      APACHE_PORT: 11000
+    expose:
+      - 11000
+    image: nextcloud/all-in-one:latest
     labels:
       homepage.group: Personal Services
       homepage.name: NextCloud
       homepage.href: https://cloud.${MY_TLD}
-      homepage.icon: nextcloud.png
+      homepage.icon: nextcloud.svg
       homepage.description: Private Cloud
       swag: enable
-      swag_proto: https
+      swag_port: 11000
+      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}
-    networks:
-      default: null
     ports:
-      - mode: ingress
-        protocol: tcp
-        published: "444"
-        target: 443
+      - 56713:8080
     restart: unless-stopped
     volumes:
-      - bind:
-          create_host_path: true
-        read_only: true
-        source: /etc/localtime
-        target: /etc/localtime
-        type: bind
-      - bind:
-          create_host_path: true
-        source: ${DOCKER_VOLUME_CONFIG}/nextcloud
-        target: /config
-        type: bind
-      - bind:
-          create_host_path: true
-        source: /rinoa-storage
-        target: /storage
-        type: bind
-      - bind:
-          create_host_path: true
-        source: ${DOCKER_VOLUME_CONFIG}/nextcloud
-        target: /data
-        type: bind
+      - /var/run/docker.sock:/var/run/docker.sock
+      - nextcloud_aio_mastercontainer:/mnt/docker-aio-config
   ollama:
     container_name: ollama
     image: ollama/ollama
@@ -4377,8 +4361,12 @@ services:
         condition: service_started
         required: true
     environment:
-      MONGO_URL: mongodb://mongodb:27017/rocketchat?replicaSet=rinoa
-      MONGO_OPLOG_URL: mongodb://mongodb:27017/local?replicaSet=rinoa
+      ADMIN_USERNAME: Trez.One
+      ADMIN_NAME: Charish Patel
+      ADMIN_PASS: ${ROCKETCHAT_ADMIN_PASSWORD}
+      ADMIN_EMAIL: charish.patel@trez.wtf
+      MONGO_URL: mongodb://rocketchat:${ROCKETCHAT_MONGODB_PASSWORD}@mongodb:27017/rocketchat?replicaSet=rinoa
+      MONGO_OPLOG_URL: mongodb://rocketchat:${ROCKETCHAT_MONGODB_PASSWORD}@mongodb:27017/local?replicaSet=rinoa
       ROOT_URL: https://chat.trez.wtf
       PORT: 3000
       DEPLOY_METHOD: docker
@@ -4817,7 +4805,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
@@ -5013,7 +5001,8 @@ services:
       homepage.widget.type: swagdashboard
       homepage.widget.url: http://swag:81
     networks:
-      default: null
+      - default
+      - nextcloud-aio
     ports:
       - mode: ingress
         protocol: tcp
@@ -6632,7 +6621,7 @@ services:
         source: /var/run/docker.sock
         target: /var/run/docker.sock
         type: bind
-  wazuh.agent:
+  wazuh-agent:
     container_name: wazuh.agent
     environment:
       JOIN_MANAGER_PROTOCOL: https
@@ -6645,17 +6634,17 @@ services:
       VIRUS_TOTAL_KEY: ${VIRUS_TOTAL_API_KEY}
       DOCKER_HOST: tcp://dockerproxy:2375
     hostname: wazuh.agent
-    image: opennix/wazuh-agent:latest
+    image: kennyopennix/wazuh-agent:latest
     networks:
       default: null
     restart: unless-stopped
-  wazuh.dashboard:
-    container_name: wazuh.dashboard
+  wazuh-dashboard:
+    container_name: wazuh-dashboard
     depends_on:
-      wazuh.indexer:
+      wazuh-indexer:
         condition: service_started
         required: true
-      wazuh.manager:
+      wazuh-manager:
         condition: service_started
         required: true
         restart: true
@@ -6667,7 +6656,7 @@ services:
       DASHBOARD_PASSWORD: ${WAZUH_KIBANA_PASSWORD}
       API_USERNAME: wazuh-wui
       API_PASSWORD: ${WAZUH_API_PASSWORD}
-    hostname: wazuh.dashboard
+    hostname: wazuh-dashboard
     image: wazuh/wazuh-dashboard:${WAZUH_VERSION}
     labels:
       swag: enable
@@ -6682,8 +6671,8 @@ services:
       homepage.icon: wazuh.svg
       homepage.description: OSS Security Platform for XDR/SIEM
     links:
-      - wazuh.indexer:wazuh.indexer
-      - wazuh.manager:wazuh.manager
+      - wazuh-indexer:wazuh-indexer
+      - wazuh-manager:wazuh-manager
     networks:
       default: null
     ports:
@@ -6693,27 +6682,27 @@ services:
         target: 5601
     restart: always
     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
         type: bind
         bind:
           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
         type: bind
         bind:
           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
         type: bind
         bind:
           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
         type: bind
         bind:
           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
         type: bind
         bind:
@@ -6726,11 +6715,11 @@ services:
         target: /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
         type: volume
         volume: {}
-  wazuh.indexer:
-    container_name: wazuh.indexer
+  wazuh-indexer:
+    container_name: wazuh-indexer
     environment:
       OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
-    hostname: wazuh.indexer
+    hostname: wazuh-indexer
     image: wazuh/wazuh-indexer:${WAZUH_VERSION}
     networks:
       default: null
@@ -6752,43 +6741,43 @@ services:
         target: /var/lib/wazuh-indexer
         type: 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
         type: bind
         bind:
           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
         type: bind
         bind:
           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
         type: bind
         bind:
           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
         type: bind
         bind:
           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
         type: bind
         bind:
           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
         type: bind
         bind:
           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
         type: bind
         bind:
           create_host_path: true
-  wazuh.manager:
-    container_name: wazuh.manager
+  wazuh-manager:
+    container_name: wazuh-manager
     environment:
       INDEXER_URL: https://wazuh.indexer:9200
       INDEXER_USERNAME: admin
@@ -6799,7 +6788,7 @@ services:
       SSL_KEY: /etc/ssl/filebeat.key
       API_USERNAME: wazuh-wui
       API_PASSWORD: ${WAZUH_API_PASSWORD}
-    hostname: wazuh.manager
+    hostname: wazuh-manager
     image: wazuh/wazuh-manager:${WAZUH_VERSION}
     networks:
       default: null
@@ -6873,22 +6862,22 @@ services:
         target: /var/lib/filebeat
         type: 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
         type: bind
         bind:
           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
         type: bind
         bind:
           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
         type: bind
         bind:
           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
         type: bind
         bind:
@@ -6916,32 +6905,6 @@ services:
         published: "3010"
         target: 3000
     restart: unless-stopped
-  yacht:
-    container_name: yacht
-    depends_on:
-      docker-socket-proxy:
-        condition: service_started
-        required: true
-    environment:
-      DOCKER_HOST: tcp://dockerproxy:2375
-    image: selfhostedpro/yacht
-    labels:
-      homepage.group: System Administration
-      homepage.name: Yacht
-      homepage.href: https://yacht.${MY_TLD}
-      homepage.icon: yacht.svg
-      homepage.description: Web interface for managing docker containers
-      swag: enable
-      swag_proto: http
-      swag_port: 8000
-      swag_url: yacht.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://yacht.${MY_TLD}
-    ports:
-      - 19733:8000
-    restart: unless-stopped
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/yacht:/config
   your_spotify:
     container_name: your_spotify
     environment:
@@ -7468,6 +7431,10 @@ volumes:
     name: hortusfox_db_data
   immich-model-cache:
     name: immich-model-cache
+  influxdb2-data:
+    name: influxdb2-data
+  influxdb2-config:
+    name: influxdb2-config
   invidious-postgres:
     name: invidious-postgres
   invoice_ninja_public:
@@ -7498,6 +7465,8 @@ volumes:
     name: netbird-letsencrypt
   netbox-pg-db:
     name: netbox-pg-db
+  nextcloud_aio_mastercontainer:
+    name: nextcloud_aio_mastercontainer
   ollama:
     name: ollama
   paperless-ngx-data:
@@ -7617,4 +7586,4 @@ x-shared:
     image: ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION}
     restart: ${ZAMMAD_RESTART}
     volumes:
-      - zammad-storage:/opt/zammad/storage
+      - zammad-storage:/opt/zammad/storage