Pipeline fixes.

Merged by Trez.One

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

@@ -33,6 +33,7 @@ jobs:
         continue-on-error: true
         run: |
           tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
+          tea pr list --repo ${{ github.repository }} --state all
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT
@@ -184,28 +185,28 @@ jobs:
     name: Update README & Generate List of Modified Services
     runs-on: ubuntu-latest
     needs: [cloudflare-dns-setup]
-    outputs:
+    # outputs:
-      pr-pushed: ${{ steps.commit-readme.outputs.pushed }}
+    #   pr-pushed: ${{ steps.commit-readme.outputs.pushed }}
-      modified_services: ${{ steps.compare-services.outputs.modified_services }}
+    #   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
+      # - name: Fetch main branch for comparison
-        run: |
+      #   run: |
-          git fetch origin main:main
+      #     git fetch origin main:main
-      - name: Compare services using yq
+      # - name: Compare services using yq
-        continue-on-error: true
+      #   continue-on-error: true
-        id: compare-services
+      #   id: compare-services
-        run: |
+      #   run: |
-          current_services=$(yq '.services | to_entries' docker-compose.yml)
+      #     current_services=$(yq '.services | to_entries' docker-compose.yml)
-          git show main:docker-compose.yml > main_compose.yml
+      #     git show main:docker-compose.yml > main_compose.yml
-          main_services=$(yq '.services | to_entries' 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_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'}
+      #     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"
-          echo "modified_services=$modified_services" >> $GITHUB_OUTPUT
+      #     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
@@ -227,7 +228,7 @@ jobs:
           add: "README.md"
   pr-merge:
     name: PR Merge
-    needs: [regenerate-readme]
+    needs: [regenerate-readme-modified-services]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

ansible/app-configs/homepage_settings.yaml.j2

@@ -27,22 +27,22 @@ layout:
     # fiveColumns: true
   Infrastructure/App Performance Monitoring:
     style: row
-    columns: 4
+    columns: 3
+  Code/DevOps:
+    style: row
+    columns: 3
+  Social:
+    style: row
+    columns: 3
+  Lifestyle:
+    style: row
+    columns: 3
   Automation:
     style: columns
     row: 2
-  Code/DevOps:
-    style: columms
-    row: 2
   Privacy/Security:
     style: columns
     row: 5
-  Social:
-    style: columns
-    row: 4
-  Lifestyle:
-    style: row
-    columns: 4
   Personal Services:
     style: row
     columns: 4
@@ -57,4 +57,4 @@ layout:
     columns: 3
   Media Library:
     style: row
-    columns: 4
+    columns: 3

docker-compose.yml

@@ -130,45 +130,6 @@ services:
         type: bind
         bind:
           create_host_path: true
-  apprise:
-    container_name: apprise
-    environment:
-      PGID: 1000
-      PUID: 1000
-      TZ: America/New_York
-    hostname: Rinoa
-    image: lscr.io/linuxserver/apprise-api:latest
-    labels:
-      homepage.group: Infrastructure/App Performance Monitoring
-      homepage.name: Apprise
-      homepage.icon: apprise.png
-      homepage.href: http://192.168.1.254:8000
-      homepage.description: Cemtralized, multi-channel notification API
-    networks:
-      default: null
-    ports:
-      - mode: ingress
-        protocol: tcp
-        published: "8000"
-        target: 8000
-    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}/apprise
-        target: /config
-        type: bind
-      - bind:
-          create_host_path: true
-        source: /rinoa-storage
-        target: /storage
-        type: bind
   audiobookshelf:
     container_name: audiobookshelf
     environment:
@@ -335,6 +296,55 @@ services:
         source: /rinoa-storage
         target: /storage
         type: bind
+  beszel:
+    container_name: beszel
+    extra_hosts:
+      - host.docker.internal:host-gateway
+    image: henrygd/beszel:latest
+    labels:
+      homepage.group: Infrastructure/App Performance Monitoring
+      homepage.name: Beszel
+      homepage.href: https://beszel.${MY_TLD}
+      homepage.icon: beszel.svg
+      homepage.description: Lightweight server monitoring hub
+      homepage.widget.type: beszel
+      homepage.widget.url: http://beszel:8090
+      homepage.widget.username: ${SWAG_ENVIRONMENT_EMAIL}
+      homepage.widget.password: ${BESZEL_ADMIN_PASSWORD}
+      homepage.widget.systemId: Rinoa
+      swag: enable
+      swag_proto: http
+      swag_port: 8090
+      swag_url: beszel.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://beszel.${MY_TLD}
+    ports:
+      - 22220:8090
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/beszel:/beszel_data
+  beszel-agent:
+    container_name: beszel-agent
+    depends_on:
+      - beszel
+    environment:
+      DOCKER_HOST: tcp://dockerproxy:2375
+      PORT: 45876
+      # Do not remove quotes around the key
+      KEY: '${BESZEL_RINOA_AGENT_KEY}'
+    expose:
+      - 45876
+    image: henrygd/beszel-agent:latest
+    network_mode: host
+    restart: unless-stopped
+    volumes:
+      - /dev/sda:/extra-filesystems/sda:ro
+      - /dev/sdb:/extra-filesystems/sdb:ro
+      - /dev/sdc:/extra-filesystems/sdc:ro
+      - /dev/sdd:/extra-filesystems/sdd:ro
+      - /dev/sde:/extra-filesystems/sde:ro
+      - /dev/sdf:/extra-filesystems/sdf:ro
+      - /dev/nvme0n1:/extra-filesystems/nvme0n1:ro
   bitmagnet:
     command:
       - worker
@@ -356,8 +366,6 @@ services:
       POSTGRES_HOST: bitmagnet-pg-db
       POSTGRES_PASSWORD: ${BITMAGNET_POSTGRESQL_PASSWORD}
       POSTGRES_USER: bitmagnet
-    extra_hosts:
-      - bitmagnet-pg-db:192.168.55.8
     image: ghcr.io/bitmagnet-io/bitmagnet:latest
     labels:
       homepage.group: Downloaders
@@ -374,8 +382,6 @@ services:
       swag_auth_bypass: /v1
       swag_port: 3333
       swag_url: btmag.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://btmag.${MY_TLD}
     network_mode: service:gluetun
     restart: always
     volumes:
@@ -697,7 +703,7 @@ services:
     restart: always
     volumes:
       - source: crowdsec-db
-        target: /metabase-data
+        target: /data/
         type: volume
         volume: {}
   czkawka:
@@ -797,14 +803,6 @@ services:
       PORT_joplin-db: 5432
       ENGINE_joplin-db: postgres@dbgate-plugin-postgres
 
-      LABEL_lobe-chat-pg-db: lobe-chat-pg-db
-      SERVER_lobe-chat-pg-db: lobe-chat-pg-db
-      USER_lobe-chat-pg-db: lobe
-      PASSWORD_lobe-chat-pg-db: ${GITEA_PG_DB_PASSWORD}
-      DATABASE_lobe-chat-pg-db: lobe
-      PORT_lobe-chat-pg-db: 5432
-      ENGINE_lobe-chat-pg-db: postgres@dbgate-plugin-postgres
-
       LABEL_mastodon-pg-db: mastodon-pg-db
       SERVER_mastodon-pg-db: mastodon-pg-db
       USER_mastodon-pg-db: mastodon
@@ -814,17 +812,9 @@ services:
       ENGINE_mastodon-pg-db: postgres@dbgate-plugin-postgres
 
       LABEL_mongodb: mongodb
-      URI_mongodb: mongodb://root:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017
+      URI_mongodb: mongodb://root:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/admin?replicaSet=rinoa
       ENGINE_mongodb: mongo@dbgate-plugin-mongo-v2
 
-      LABEL_netbox-db: netbox-db
-      SERVER_netbox-db: netbox-db
-      USER_netbox-db: netbox
-      PASSWORD_netbox-db: ${NETBOX_PG_DB_PASSWORD}
-      PORT_netbox-db: 5432
-      DATABASE_netbox-db: netbox
-      ENGINE_netbox-db: postgres@dbgate-plugin-postgres
-
       LABEL_pgbackweb-db: pgbackweb-db
       SERVER_pgbackweb-db: pgbackweb-db
       USER_pgbackweb-db: pgbackweb
@@ -853,13 +843,6 @@ services:
       PORT_sonarqube-pg-db: 5432
       ENGINE_sonarqube-pg-db: postgres@dbgate-plugin-postgres
 
-      LABEL_synapse-db: synapse-db
-      SERVER_synapse-db: synapse-db
-      USER_synapse-db: synapse
-      PASSWORD_synapse-db: ${SYNAPSE_POSTGRES_PASSWORD}
-      PORT_synapse-db: 5432
-      ENGINE_synapse-db: postgres@dbgate-plugin-postgres
-
       LABEL_tandoor-pg: tandoor-pg
       SERVER_tandoor-pg: tandoor-pg
       USER_tandoor-pg: tandoor
@@ -1884,6 +1867,7 @@ services:
       DB_PORT: 5432
       DB_USERNAME: immich
       DB_PASSWORD: ${IMMICH_DB_PASSWORD}
+      IMMICH_LOG_LEVEL: error
       IMMICH_TELEMETRY_INCLUDE: all
     healthcheck:
       disable: false
@@ -1964,7 +1948,7 @@ services:
     container_name: immich-public-proxy
     depends_on:
       immich-server:
-        condition: service_started
+        condition: service_healthy
         required: true
     environment:
       IMMICH_URL: http://immich-server:2283
@@ -2000,7 +1984,7 @@ services:
     image: ghcr.io/varun-raj/immich-power-tools:latest
     labels:
       homepage.group: Lifestyle
-      homepage.name: Immich Public Proxy
+      homepage.name: Immich Power Tools
       homepage.href: https://pics.${MY_TLD}/tools
       homepage.icon: sh-immich-power-tools.png
       homepage.description: Tools for Immich
@@ -3492,7 +3476,7 @@ services:
       - netbird-letsencrypt:/etc/letsencrypt:ro
       - ${DOCKER_VOLUME_CONFIG}/netbird/management.json:/etc/netbird/management.json
     ports:
-      - 33073:443 #API port
+      - 23833:443 #API port
   netbird-coturn:
     command:
       - -c /etc/turnserver.conf
@@ -3505,113 +3489,6 @@ services:
     #      - ${DOCKER_VOLUME_CONFIG}/netbird/privkey.pem:/etc/coturn/private/privkey.pem:ro
     #      - ${DOCKER_VOLUME_CONFIG}/netbird/cert.pem:/etc/coturn/certs/cert.pem:ro
     network_mode: host
-  netbox:
-    container_name: netbox
-    depends_on:
-      netbox-db:
-        condition: service_healthy
-        required: true
-      redis:
-        condition: service_started
-        required: true
-    environment:
-      PUID: ${PUID}
-      PGID: ${PGID}
-      TZ: ${TZ}
-      SUPERUSER_EMAIL: charish.patel@pm.me
-      SUPERUSER_PASSWORD: ${NETBOX_SUPERUSER_PASSWORD}
-      ALLOWED_HOST: net.trez.wtf
-      DB_NAME: netbox
-      DB_USER: netbox
-      DB_PASSWORD: ${NETBOX_PG_DB_PASSWORD}
-      DB_HOST: netbox-db
-      DB_PORT: 5432
-      DEBUG: false
-      DOCKER_MODS: linuxserver/mods:netbox-slurpit
-      REDIS_HOST: redis
-      REDIS_PORT: 6379
-      REMOTE_AUTH_ENABLED:
-    image: lscr.io/linuxserver/netbox:latest
-    labels:
-      homepage.group: Infrastructure/App Performance Monitoring
-      homepage.name: Netbox
-      homepage.href: https://net.${MY_TLD}
-      homepage.icon: netbox.svg
-      homepage.description: Network modeling/documentation
-      swag: enable
-      swag_url: net.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://net.${MY_TLD}
-    ports:
-      - 8007:8000
-    restart: unless-stopped
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/netbox/:/config
-  netbox-db:
-    container_name: netbox-db
-    environment:
-      POSTGRES_USER: netbox
-      POSTGRES_PASSWORD: ${NETBOX_PG_DB_PASSWORD}
-      POSTGRES_DB: netbox
-    expose:
-      - 5432
-    healthcheck:
-      test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER
-      start_period: 20s
-      timeout: 30s
-      interval: 10s
-      retries: 5
-    image: postgres:17-alpine
-    restart: always
-    volumes:
-      - source: netbox-pg-db
-        target: /var/lib/postgresql/data
-        type: volume
-        volume: {}
-  netdata:
-    cap_add:
-      - SYS_PTRACE
-      - SYS_ADMIN
-    container_name: netdata
-    depends_on:
-      docker-socket-proxy:
-        condition: service_started
-        required: true
-    environment:
-      DOCKER_HOST: tcp://dockerproxy:2375
-    image: netdata/netdata:stable
-    labels:
-      homepage.group: Infrastructure/App Monitoring
-      homepage.name: Netdata
-      homepage.href: https://netdata.${MY_TLD}
-      homepage.icon: netdata.svg
-      homepage.description: Real-time monitoring/observcability platform
-      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:
@@ -3701,6 +3578,8 @@ services:
         required: true
         restart: true
     environment:
+      ENABLE_SIGNUP: true
+      ENABLE_LOGIN_FORM: true
       ENABLE_OLLAMA_API: true
       OLLAMA_BASE_URLS: http://ollama:11434
     image: ghcr.io/open-webui/open-webui:main
@@ -3936,6 +3815,28 @@ services:
     restart: unless-stopped
     volumes:
         - portainer-data:/data
+  portall:
+    container_name: portall
+    image: need4swede/portall:latest
+    environment:
+      SECRET_KEY: ${PORTALL_SECRET_KEY}
+    labels:
+      swag: enable
+      swag_auth: authelia
+      swag_proto: http
+      swag_port: 9000
+      swag_url: portall.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://portall.${MY_TLD}
+      homepage.group: System Administration
+      homepage.name: Portall
+      homepage.href: https://portainer.${MY_TLD}
+      homepage.icon: sh-portall.png
+      homepage.description: Management for container ports
+    ports:
+      - 8000:8080
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/portall:/app/instance
   postal-smtp:
     cap_add:
       - NET_BIND_SERVICE
@@ -4457,6 +4358,10 @@ services:
       swag_proto: http
       swag_port: 3000
       swag_url: scrape.${MY_TLD}
+      swag_server_custom_directive: |
+        location /api {
+              proxy_pass http://scraperr-api:8000;
+        }
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://scrape.${MY_TLD}
     networks:
@@ -4476,11 +4381,6 @@ services:
     expose:
       - 8000
     image: jpyles0524/scraperr_api:latest
-    labels:
-      swag: enable
-      swag_proto: http
-      swag_port: 3000
-      swag_server_custom_directive: "location /api/ {  rewrite ^/api(/.*)$ /$1 break ; proxy_pass http://scraperr:3000; }"
     networks:
       default: null
     restart: unless-stopped
@@ -4577,83 +4477,6 @@ services:
         type: bind
         bind:
           create_host_path: true
-  slurpit-portal:
-    container_name: slurpit-portal
-    environment:
-      TZ: ${TZ}
-      PORTAL_BASE_URL: https://slurpit.trez.wtf
-      PORTAL_WAREHOUSE_URL: http://slurpit-warehouse
-    image: slurpit/portal:latest
-    labels:
-      homepage.group: Infrastructure/App Performance Monitoring
-      homepage.name: Slurp'it
-      homepage.href: https://slurpit.${MY_TLD}
-      homepage.icon: /icons/slurpit.png
-      homepage.description: Network discovery
-      swag: enable
-      swag_port: 80
-      swag_url: slurpit.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://slurpit.${MY_TLD}
-    ports:
-      - 8110:80
-      - 5443:443
-    restart: always
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/nginx:/var/log/nginx/
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/mysql:/var/log/mysql/
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/php:/var/log/php/
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/certs:/etc/nginx/certs/
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/db/portal:/var/lib/mysql
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/backup/portal:/backup/files
-  slurpit-scanner:
-    container_name: slurpit-scanner
-    depends_on:
-      slurpit-warehouse:
-        condition: service_healthy
-    environment:
-      TZ: ${TZ}
-      SCANNER_POOLSIZE: 4
-      SCANNER_TIMEOUT: 10
-      SCANNER_WAREHOUSE_URL: http://slurpit-warehouse
-    image: slurpit/scanner:latest
-    restart: always
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/scanner:/logs
-  slurpit-scraper:
-    container_name: slurpit-scraper
-    depends_on:
-      slurpit-warehouse:
-        condition: service_healthy
-    image: slurpit/scraper:latest
-    environment:
-      TZ: ${TZ}
-      SCRAPER_TIMEOUT: 20
-      SCRAPER_POOLSIZE: 4
-      SCRAPER_WAREHOUSE_URL: http://slurpit-warehouse
-    restart: always
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/scraper:/logs
-  slurpit-warehouse:
-    container_name: slurpit-warehouse
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/services"]
-      interval: 10s
-      timeout: 10s
-      retries: 360
-    image: slurpit/warehouse:latest
-    environment:
-      TZ: ${TZ}
-      WAREHOUSE_CALLBACK_SCANNER_URL: http://slurpit-portal/callback/scanner
-      WAREHOUSE_CALLBACK_SCANNER_TOKEN:
-      WAREHOUSE_CALLBACK_SCRAPER_URL: http://slurpit-portal/callback/scraper
-      WAREHOUSE_CALLBACK_SCRAPER_TOKEN:
-    restart: always
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/backup/warehouse:/backup/files
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/db/warehouse:/var/lib/mongodb
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/warehouse/mongodb:/var/log/mongodb
-      - ${DOCKER_VOLUME_CONFIG}/slurpit/logs/warehouse:/logs
   sonarqube:
     container_name: sonarqube
     depends_on:
@@ -4815,7 +4638,7 @@ services:
     depends_on:
       - lidarr
       - soulseek
-    environment: 
+    environment:
       PUID: ${PUID}
       PGID: ${PGID}
       TZ: ${TZ}
@@ -4904,11 +4727,13 @@ services:
       homepage.description: Self-hosted internet performance tracking
       homepage.href: https://speed.${MY_TLD}
       homepage.icon: speedtest-tracker.png
+      homepage.widget.type: speedtest
+      homepage.widget.url: http://speedtest-tracker
       swag: enable
       swag_proto: http
       swag_url: speed.${MY_TLD}
       swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://slsk.${MY_TLD}
+      swag.uptime-kuma.monitor.url: https://speed.${MY_TLD}
     ports:
         - 47512:80
         - 62777:443
@@ -4953,7 +4778,7 @@ services:
       VALIDATION: dns
       CROWDSEC_API_KEY: ${CROWDSEC_API_KEY}
       CROWDSEC_LAPI_URL: http://crowdsec:8080
-      DOCKER_MODS: linuxserver/mods:universal-docker|linuxserver/mods:swag-auto-reload|linuxserver/mods:swag-auto-proxy|linuxserver/mods:swag-dashboard|linuxserver/mods:swag-maxmind|linuxserver/mods:universal-stdout-logs|ghcr.io/linuxserver/mods:swag-crowdsec #|linuxserver/mods:swag-auto-uptime-kuma
+      DOCKER_MODS: linuxserver/mods:universal-docker|linuxserver/mods:swag-auto-reload|linuxserver/mods:swag-auto-proxy|linuxserver/mods:swag-dashboard|linuxserver/mods:swag-maxmind|linuxserver/mods:universal-stdout-logs|ghcr.io/linuxserver/mods:swag-crowdsec|linuxserver/mods:swag-auto-uptime-kuma
       PROPAGATION: 30
       UPTIME_KUMA_PASSWORD: ${UPTIME_KUMA_PASSWORD}
       UPTIME_KUMA_URL: http://uptimekuma:3001
@@ -5046,7 +4871,7 @@ services:
       swag_proto: http
       swag_url: recipes.${MY_TLD}
       swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://trac.${MY_TLD}
+      swag.uptime-kuma.monitor.url: https://recipes.${MY_TLD}
     networks:
       default: null
     ports:
@@ -6533,7 +6358,7 @@ services:
       swag_proto: http
       swag_url: subs.${MY_TLD}
       swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://trac.${MY_TLD}
+      swag.uptime-kuma.monitor.url: https://subs.${MY_TLD}
     networks:
       default: null
     ports:
@@ -6597,267 +6422,6 @@ services:
         source: /var/run/docker.sock
         target: /var/run/docker.sock
         type: bind
-  # wazuh-agent:
-  #   container_name: wazuh.agent
-  #   environment:
-  #     JOIN_MANAGER_PROTOCOL: https
-  #     JOIN_MANAGER_MASTER_HOST: wazuh.manager
-  #     JOIN_MANAGER_WORKER_HOST: wazuh.manager
-  #     JOIN_MANAGER_USER: wazuh-wui
-  #     JOIN_MANAGER_PASSWORD: ${WAZUH_API_PASSWORD}
-  #     JOIN_MANAGER_API_PORT: 55000
-  #     JOIN_MANAGER_PORT: 1514
-  #     VIRUS_TOTAL_KEY: ${VIRUS_TOTAL_API_KEY}
-  #     DOCKER_HOST: tcp://dockerproxy:2375
-  #   hostname: wazuh.agent
-  #   image: kennyopennix/wazuh-agent:latest
-  #   networks:
-  #     default: null
-  #   restart: unless-stopped
-  # wazuh-dashboard:
-  #   container_name: wazuh-dashboard
-  #   depends_on:
-  #     wazuh-indexer:
-  #       condition: service_started
-  #       required: true
-  #     wazuh-manager:
-  #       condition: service_started
-  #       required: true
-  #       restart: true
-  #   environment:
-  #     INDEXER_USERNAME: admin
-  #     INDEXER_PASSWORD: ${WAZUH_INDEXER_PASSWORD}
-  #     WAZUH_API_URL: https://wazuh.manager
-  #     DASHBOARD_USERNAME: kibanaserver
-  #     DASHBOARD_PASSWORD: ${WAZUH_KIBANA_PASSWORD}
-  #     API_USERNAME: wazuh-wui
-  #     API_PASSWORD: ${WAZUH_API_PASSWORD}
-  #   hostname: wazuh-dashboard
-  #   image: wazuh/wazuh-dashboard:${WAZUH_VERSION}
-  #   labels:
-  #     swag: enable
-  #     swag_proto: https
-  #     swag_port: 5601
-  #     swag_url: wsec.${MY_TLD}
-  #     swag.uptime-kuma.enabled: true
-  #     swag.uptime-kuma.monitor.url: https://wsec.${MY_TLD}
-  #     homepage.group: Privacy/Security
-  #     homepage.name: Wazuh
-  #     homepage.href: https://wsec.${MY_TLD}
-  #     homepage.icon: wazuh.svg
-  #     homepage.description: OSS Security Platform for XDR/SIEM
-  #   links:
-  #     - wazuh-indexer:wazuh-indexer
-  #     - wazuh-manager:wazuh-manager
-  #   networks:
-  #     default: null
-  #   ports:
-  #     - mode: ingress
-  #       protocol: tcp
-  #       published: "5601"
-  #       target: 5601
-  #   restart: always
-  #   volumes:
-  #     - 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/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/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/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/wazuh.yml
-  #       target: /usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml
-  #       type: bind
-  #       bind:
-  #         create_host_path: true
-  #     - source: wazuh-dashboard-config
-  #       target: /usr/share/wazuh-dashboard/data/wazuh/config
-  #       type: volume
-  #       volume: {}
-  #     - source: wazuh-dashboard-custom
-  #       target: /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
-  #       type: volume
-  #       volume: {}
-  # wazuh-indexer:
-  #   container_name: wazuh-indexer
-  #   environment:
-  #     OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
-  #   hostname: wazuh-indexer
-  #   image: wazuh/wazuh-indexer:${WAZUH_VERSION}
-  #   networks:
-  #     default: null
-  #   ports:
-  #     - mode: ingress
-  #       protocol: tcp
-  #       published: "9200"
-  #       target: 9200
-  #   restart: always
-  #   ulimits:
-  #     memlock:
-  #       hard: -1
-  #       soft: -1
-  #     nofile:
-  #       hard: 65536
-  #       soft: 65536
-  #   volumes:
-  #     - source: wazuh-indexer-data
-  #       target: /var/lib/wazuh-indexer
-  #       type: volume
-  #       volume: {}
-  #     - 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/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/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/generator/admin.pem
-  #       target: /usr/share/wazuh-indexer/certs/admin.pem
-  #       type: bind
-  #       bind:
-  #         create_host_path: true
-  #     - 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/wazuh.indexer.yml
-  #       target: /usr/share/wazuh-indexer/opensearch.yml
-  #       type: bind
-  #       bind:
-  #         create_host_path: true
-  #     - 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
-  #   environment:
-  #     INDEXER_URL: https://wazuh.indexer:9200
-  #     INDEXER_USERNAME: admin
-  #     INDEXER_PASSWORD: ${WAZUH_INDEXER_PASSWORD}
-  #     FILEBEAT_SSL_VERIFICATION_MODE: full
-  #     SSL_CERTIFICATE_AUTHORITIES: /etc/ssl/root-ca.pem
-  #     SSL_CERTIFICATE: /etc/ssl/filebeat.pem
-  #     SSL_KEY: /etc/ssl/filebeat.key
-  #     API_USERNAME: wazuh-wui
-  #     API_PASSWORD: ${WAZUH_API_PASSWORD}
-  #   hostname: wazuh-manager
-  #   image: wazuh/wazuh-manager:${WAZUH_VERSION}
-  #   networks:
-  #     default: null
-  #   ports:
-  #     - mode: ingress
-  #       protocol: tcp
-  #       published: "1514"
-  #       target: 1514
-  #     - mode: ingress
-  #       protocol: tcp
-  #       published: "1515"
-  #       target: 1515
-  #     - mode: ingress
-  #       protocol: udp
-  #       published: "514"
-  #       target: 514
-  #     - mode: ingress
-  #       protocol: tcp
-  #       published: "55000"
-  #       target: 55000
-  #   restart: always
-  #   ulimits:
-  #     memlock:
-  #       hard: -1
-  #       soft: -1
-  #     nofile:
-  #       hard: 655360
-  #       soft: 655360
-  #   volumes:
-  #     - source: wazuh_api_configuration
-  #       target: /var/ossec/api/configuration
-  #       type: volume
-  #       volume: {}
-  #     - source: wazuh_etc
-  #       target: /var/ossec/etc
-  #       type: volume
-  #       volume: {}
-  #     - source: wazuh_logs
-  #       target: /var/ossec/logs
-  #       type: volume
-  #       volume: {}
-  #     - source: wazuh_queue
-  #       target: /var/ossec/queue
-  #       type: volume
-  #       volume: {}
-  #     - source: wazuh_var_multigroups
-  #       target: /var/ossec/var/multigroups
-  #       type: volume
-  #       volume: {}
-  #     - source: wazuh_integrations
-  #       target: /var/ossec/integrations
-  #       type: volume
-  #       volume: {}
-  #     - source: wazuh_active_response
-  #       target: /var/ossec/active-response/bin
-  #       type: volume
-  #       volume: {}
-  #     - source: wazuh_agentless
-  #       target: /var/ossec/agentless
-  #       type: volume
-  #       volume: {}
-  #     - source: wazuh_wodles
-  #       target: /var/ossec/wodles
-  #       type: volume
-  #       volume: {}
-  #     - source: filebeat_etc
-  #       target: /etc/filebeat
-  #       type: volume
-  #       volume: {}
-  #     - source: filebeat_var
-  #       target: /var/lib/filebeat
-  #       type: volume
-  #       volume: {}
-  #     - 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/generator/wazuh.manager.pem
-  #       target: /etc/ssl/filebeat.pem
-  #       type: bind
-  #       bind:
-  #         create_host_path: true
-  #     - 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/wazuh_manager.conf
-  #       target: /wazuh-config-mount/etc/ossec.conf
-  #       type: bind
-  #       bind:
-  #         create_host_path: true
   web-check:
     container_name: web-check
     image: lissy93/web-check