Yet more pipeline tweaks.

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

@@ -74,7 +74,7 @@ jobs:
         with:
           directory: ansible/
           playbook: docker_config_deploy.yml
-          key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }}
+          key: ${{ secrets.RINOA_ANSIBLE_PRIVATE_KEY }}
           options: |
             --inventory inventory/hosts.yml
             --check

docker-compose.yml

@@ -3488,7 +3488,9 @@ services:
   peppermint:
     container_name: peppermint
     depends_on:
-      - peppermint-pg-db
+      peppermint-pg-db:
+        condition: service_started
+        required: true
     environment:
       DB_USERNAME: peppermint
       DB_PASSWORD: ${PEPPERMINT_PG_PASSWORD}
@@ -6397,362 +6399,6 @@ services:
         source: /rinoa-storage
         target: /storage
         type: bind
-  zammad-backup:
-    command:
-      - zammad-backup
-    container_name: zammad-backup
-    depends_on:
-      zammad-postgresql:
-        condition: service_started
-        required: true
-      zammad-railsserver:
-        condition: service_started
-        required: true
-    entrypoint: /usr/local/bin/backup.sh
-    environment:
-      AUTOWIZARD_JSON: null
-      AUTOWIZARD_RELATIVE_PATH: null
-      BACKUP_TIME: "03:00"
-      ELASTICSEARCH_ENABLED: true
-      ELASTICSEARCH_HOST: zammad-elasticsearch
-      ELASTICSEARCH_NAMESPACE: trez_it
-      ELASTICSEARCH_PORT: 9200
-      ELASTICSEARCH_REINDEX: true
-      ELASTICSEARCH_SCHEMA: http
-      ELASTICSEARCH_SSL_VERIFY: false
-      HOLD_DAYS: "10"
-      MEMCACHE_SERVERS: ${ZAMMAD_MEMCACHE_SERVERS}
-      POSTGRESQL_DB: ${ZAMMAD_POSTGRES_DB}
-      POSTGRESQL_DB_CREATE: true
-      POSTGRESQL_HOST: ${ZAMMAD_POSTGRES_HOST}
-      POSTGRESQL_OPTIONS: ${ZAMMAD_POSTGRESQL_OPTIONS}
-      POSTGRESQL_PASS: ${ZAMMAD_POSTGRES_PASS}
-      POSTGRESQL_PORT: ${ZAMMAD_POSTGRES_PORT}
-      POSTGRESQL_USER: ${ZAMMAD_POSTGRES_USER}
-      RAILS_LOG_TO_STDOUT: true
-      RAILS_TRUSTED_PROXIES: 172.18.0.0/16
-      REDIS_URL: ${ZAMMAD_REDIS_URL}
-      S3_URL: http://${ZAMMAD_S3_ACCESS_KEY}:${ZAMMAD_S3_SECRET_KEY}@minio:9000/zammad?region=us-east-fh-pln&force_path_style=true
-      TZ: Europe/Berlin
-      ZAMMAD_BIND_IP: 0.0.0.0
-      ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS: null
-      ZAMMAD_PROCESS_SCHEDULED: null
-      ZAMMAD_SESSION_JOBS: null
-      ZAMMAD_WEB_CONCURRENCY: null
-    image: postgres:${ZAMMAD_POSTGRES_VERSION}
-    networks:
-      default: null
-    restart: ${ZAMMAD_RESTART}
-    volumes:
-      - source: zammad-backup
-        target: /var/tmp/zammad
-        type: volume
-        volume: {}
-      - read_only: true
-        source: zammad-storage
-        target: /opt/zammad/storage
-        type: volume
-        volume: {}
-      - read_only: true
-        source: ${DOCKER_VOLUME_CONFIG}/zammad/scripts/backup.sh
-        target: /usr/local/bin/backup.sh
-        type: bind
-        volume: {}
-  zammad-elasticsearch:
-    container_name: zammad-elasticsearch
-    expose:
-      - 9200
-    image: bitnami/elasticsearch:${ZAMMAD_ELASTICSEARCH_VERSION}
-    networks:
-      default: null
-    restart: ${ZAMMAD_RESTART}
-    volumes:
-      - source: zammad-es-data
-        target: /bitnami/elasticsearch/data
-        type: volume
-        volume: {}
-  zammad-init:
-    command:
-      - zammad-init
-    container_name: zammad-init
-    depends_on:
-      zammad-postgresql:
-        condition: service_started
-        required: true
-    environment:
-      AUTOWIZARD_JSON: null
-      AUTOWIZARD_RELATIVE_PATH: null
-      ELASTICSEARCH_ENABLED: true
-      ELASTICSEARCH_HOST: zammad-elasticsearch
-      ELASTICSEARCH_NAMESPACE: trez_it
-      ELASTICSEARCH_PORT: 9200
-      ELASTICSEARCH_REINDEX: true
-      ELASTICSEARCH_SCHEMA: http
-      ELASTICSEARCH_SSL_VERIFY: false
-      MEMCACHE_SERVERS: ${ZAMMAD_MEMCACHE_SERVERS}
-      POSTGRESQL_DB: ${ZAMMAD_POSTGRES_DB}
-      POSTGRESQL_DB_CREATE: true
-      POSTGRESQL_HOST: ${ZAMMAD_POSTGRES_HOST}
-      POSTGRESQL_OPTIONS: ${ZAMMAD_POSTGRESQL_OPTIONS}
-      POSTGRESQL_PASS: ${ZAMMAD_POSTGRES_PASS}
-      POSTGRESQL_PORT: ${ZAMMAD_POSTGRES_PORT}
-      POSTGRESQL_USER: ${ZAMMAD_POSTGRES_USER}
-      RAILS_LOG_TO_STDOUT: true
-      RAILS_TRUSTED_PROXIES: 172.18.0.0/16
-      REDIS_URL: ${ZAMMAD_REDIS_URL}
-      S3_URL: http://${ZAMMAD_S3_ACCESS_KEY}:${ZAMMAD_S3_SECRET_KEY}@minio:9000/zammad?region=us-east-fh-pln&force_path_style=true
-      ZAMMAD_BIND_IP: 0.0.0.0
-      ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS: null
-      ZAMMAD_PROCESS_SCHEDULED: null
-      ZAMMAD_SESSION_JOBS: null
-      ZAMMAD_WEB_CONCURRENCY: null
-    hostname: init
-    image: ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION}
-    networks:
-      default: null
-    restart: on-failure
-    user: "0:0"
-    volumes:
-      - zammad-storage:/opt/zammad/storage
-  zammad-memcached:
-    command: memcached -m 256M
-    container_name: zammad-memcached
-    image: memcached:${ZAMMAD_MEMCACHE_VERSION}
-    networks:
-      default: null
-    restart: ${ZAMMAD_RESTART}
-  zammad-nginx:
-    command:
-      - zammad-nginx
-    container_name: zammad-nginx
-    depends_on:
-      zammad-railsserver:
-        condition: service_started
-        required: true
-    environment:
-      AUTOWIZARD_JSON: null
-      AUTOWIZARD_RELATIVE_PATH: null
-      ELASTICSEARCH_ENABLED: true
-      ELASTICSEARCH_HOST: zammad-elasticsearch
-      ELASTICSEARCH_NAMESPACE: trez_it
-      ELASTICSEARCH_PORT: 9200
-      ELASTICSEARCH_REINDEX: true
-      ELASTICSEARCH_SCHEMA: http
-      ELASTICSEARCH_SSL_VERIFY: false
-      MEMCACHE_SERVERS: ${ZAMMAD_MEMCACHE_SERVERS}
-      POSTGRESQL_DB: ${ZAMMAD_POSTGRES_DB}
-      POSTGRESQL_DB_CREATE: true
-      POSTGRESQL_HOST: ${ZAMMAD_POSTGRES_HOST}
-      POSTGRESQL_OPTIONS: ${ZAMMAD_POSTGRESQL_OPTIONS}
-      POSTGRESQL_PASS: ${ZAMMAD_POSTGRES_PASS}
-      POSTGRESQL_PORT: ${ZAMMAD_POSTGRES_PORT}
-      POSTGRESQL_USER: ${ZAMMAD_POSTGRES_USER}
-      RAILS_LOG_TO_STDOUT: true
-      RAILS_TRUSTED_PROXIES: 172.18.0.0/16
-      REDIS_URL: ${ZAMMAD_REDIS_URL}
-      S3_URL: http://${ZAMMAD_S3_ACCESS_KEY}:${ZAMMAD_S3_SECRET_KEY}@minio:9000/zammad?region=us-east-fh-pln&force_path_style=true
-      ZAMMAD_BIND_IP: 0.0.0.0
-      ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS: null
-      ZAMMAD_PROCESS_SCHEDULED: null
-      ZAMMAD_SESSION_JOBS: null
-      ZAMMAD_WEB_CONCURRENCY: null
-    expose:
-      - "8080"
-    image: ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION}
-    labels:
-      swag: enable
-      swag_proto: http
-      swag_port: 8080
-      swag_url: support.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://support.${MY_TLD}
-      homepage.group: Professional Services
-      homepage.name: Zammad
-      homepage.href: https://support.${MY_TLD}
-      homepage.icon: zammad.svg
-      homepage.description: Open-source helpdesk/customer support system
-    networks:
-      default: null
-    restart: ${ZAMMAD_RESTART}
-    volumes:
-      - zammad-storage:/opt/zammad/storage
-  zammad-postgresql:
-    container_name: zammad-postgresql
-    environment:
-      POSTGRES_DB: ${ZAMMAD_POSTGRES_DB}
-      POSTGRES_PASSWORD: ${ZAMMAD_POSTGRES_PASS}
-      POSTGRES_USER: ${ZAMMAD_POSTGRES_USER}
-    hostname: postgresql
-    image: postgres:${ZAMMAD_POSTGRES_VERSION}
-    networks:
-      default: null
-    restart: ${ZAMMAD_RESTART}
-    volumes:
-      - source: zammad-pg-data
-        target: /var/lib/postgresql/data
-        type: volume
-        volume: {}
-  zammad-railsserver:
-    command:
-      - zammad-railsserver
-    container_name: zammad-railserver
-    depends_on:
-      zammad-memcached:
-        condition: service_started
-        required: true
-      zammad-postgresql:
-        condition: service_started
-        required: true
-      zammad-redis:
-        condition: service_started
-        required: true
-    environment:
-      AUTOWIZARD_JSON: null
-      AUTOWIZARD_RELATIVE_PATH: null
-      ELASTICSEARCH_ENABLED: true
-      ELASTICSEARCH_HOST: zammad-elasticsearch
-      ELASTICSEARCH_NAMESPACE: trez_it
-      ELASTICSEARCH_PORT: 9200
-      ELASTICSEARCH_REINDEX: true
-      ELASTICSEARCH_SCHEMA: http
-      ELASTICSEARCH_SSL_VERIFY: false
-      MEMCACHE_SERVERS: ${ZAMMAD_MEMCACHE_SERVERS}
-      POSTGRESQL_DB: ${ZAMMAD_POSTGRES_DB}
-      POSTGRESQL_DB_CREATE: true
-      POSTGRESQL_HOST: ${ZAMMAD_POSTGRES_HOST}
-      POSTGRESQL_OPTIONS: ${ZAMMAD_POSTGRESQL_OPTIONS}
-      POSTGRESQL_PASS: ${ZAMMAD_POSTGRES_PASS}
-      POSTGRESQL_PORT: ${ZAMMAD_POSTGRES_PORT}
-      POSTGRESQL_USER: ${ZAMMAD_POSTGRES_USER}
-      RAILS_LOG_TO_STDOUT: true
-      RAILS_TRUSTED_PROXIES: 172.18.0.0/16
-      REDIS_URL: ${ZAMMAD_REDIS_URL}
-      S3_URL: http://${ZAMMAD_S3_ACCESS_KEY}:${ZAMMAD_S3_SECRET_KEY}@minio:9000/zammad?region=us-east-fh-pln&force_path_style=true
-      ZAMMAD_BIND_IP: 0.0.0.0
-      ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS: null
-      ZAMMAD_PROCESS_SCHEDULED: null
-      ZAMMAD_SESSION_JOBS: null
-      ZAMMAD_WEB_CONCURRENCY: null
-    image: ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION}
-    networks:
-      default: null
-    restart: ${ZAMMAD_RESTART}
-    volumes:
-      - source: zammad-storage
-        target: /opt/zammad/storage
-        type: volume
-        volume: {}
-  zammad-redis:
-    container_name: zammad-redis
-    image: redis:${ZAMMAD_REDIS_VERSION}
-    networks:
-      default: null
-    restart: ${ZAMMAD_RESTART}
-    volumes:
-      - source: zammad-redis-data
-        target: /data
-        type: volume
-        volume: {}
-  zammad-scheduler:
-    command:
-      - zammad-scheduler
-    container_name: zammad-scheduler
-    depends_on:
-      zammad-memcached:
-        condition: service_started
-        required: true
-      zammad-postgresql:
-        condition: service_started
-        required: true
-      zammad-redis:
-        condition: service_started
-        required: true
-    environment:
-      AUTOWIZARD_JSON: null
-      AUTOWIZARD_RELATIVE_PATH: null
-      ELASTICSEARCH_ENABLED: true
-      ELASTICSEARCH_HOST: zammad-elasticsearch
-      ELASTICSEARCH_NAMESPACE: trez_it
-      ELASTICSEARCH_PORT: 9200
-      ELASTICSEARCH_REINDEX: true
-      ELASTICSEARCH_SCHEMA: http
-      ELASTICSEARCH_SSL_VERIFY: false
-      MEMCACHE_SERVERS: ${ZAMMAD_MEMCACHE_SERVERS}
-      POSTGRESQL_DB: ${ZAMMAD_POSTGRES_DB}
-      POSTGRESQL_DB_CREATE: true
-      POSTGRESQL_HOST: ${ZAMMAD_POSTGRES_HOST}
-      POSTGRESQL_OPTIONS: ${ZAMMAD_POSTGRESQL_OPTIONS}
-      POSTGRESQL_PASS: ${ZAMMAD_POSTGRES_PASS}
-      POSTGRESQL_PORT: ${ZAMMAD_POSTGRES_PORT}
-      POSTGRESQL_USER: ${ZAMMAD_POSTGRES_USER}
-      RAILS_LOG_TO_STDOUT: true
-      RAILS_TRUSTED_PROXIES: 172.18.0.0/16
-      REDIS_URL: ${ZAMMAD_REDIS_URL}
-      S3_URL: http://${ZAMMAD_S3_ACCESS_KEY}:${ZAMMAD_S3_SECRET_KEY}@minio:9000/zammad?region=us-east-fh-pln&force_path_style=true
-      ZAMMAD_BIND_IP: 0.0.0.0
-      ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS: null
-      ZAMMAD_PROCESS_SCHEDULED: null
-      ZAMMAD_SESSION_JOBS: null
-      ZAMMAD_WEB_CONCURRENCY: null
-    image: ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION}
-    networks:
-      default: null
-    restart: ${ZAMMAD_RESTART}
-    volumes:
-      - source: zammad-storage
-        target: /opt/zammad/storage
-        type: volume
-        volume: {}
-  zammad-websocket:
-    command:
-      - zammad-websocket
-    container_name: zammad-websocket
-    depends_on:
-      zammad-memcached:
-        condition: service_started
-        required: true
-      zammad-postgresql:
-        condition: service_started
-        required: true
-      zammad-redis:
-        condition: service_started
-        required: true
-    environment:
-      AUTOWIZARD_JSON: null
-      AUTOWIZARD_RELATIVE_PATH: null
-      ELASTICSEARCH_ENABLED: true
-      ELASTICSEARCH_HOST: zammad-elasticsearch
-      ELASTICSEARCH_NAMESPACE: trez_it
-      ELASTICSEARCH_PORT: 9200
-      ELASTICSEARCH_REINDEX: true
-      ELASTICSEARCH_SCHEMA: http
-      ELASTICSEARCH_SSL_VERIFY: false
-      MEMCACHE_SERVERS: ${ZAMMAD_MEMCACHE_SERVERS}
-      POSTGRESQL_DB: ${ZAMMAD_POSTGRES_DB}
-      POSTGRESQL_DB_CREATE: true
-      POSTGRESQL_HOST: ${ZAMMAD_POSTGRES_HOST}
-      POSTGRESQL_OPTIONS: ${ZAMMAD_POSTGRESQL_OPTIONS}
-      POSTGRESQL_PASS: ${ZAMMAD_POSTGRES_PASS}
-      POSTGRESQL_PORT: ${ZAMMAD_POSTGRES_PORT}
-      POSTGRESQL_USER: ${ZAMMAD_POSTGRES_USER}
-      RAILS_LOG_TO_STDOUT: true
-      RAILS_TRUSTED_PROXIES: 172.18.0.0/16
-      REDIS_URL: ${ZAMMAD_REDIS_URL}
-      S3_URL: http://${ZAMMAD_S3_ACCESS_KEY}:${ZAMMAD_S3_SECRET_KEY}@minio:9000/zammad?region=us-east-fh-pln&force_path_style=true
-      ZAMMAD_BIND_IP: 0.0.0.0
-      ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS: null
-      ZAMMAD_PROCESS_SCHEDULED: null
-      ZAMMAD_SESSION_JOBS: null
-      ZAMMAD_WEB_CONCURRENCY: null
-    image: ${ZAMMAD_IMAGE_REPO}:${ZAMMAD_VERSION}
-    networks:
-      default: null
-    restart: ${ZAMMAD_RESTART}
-    volumes:
-      - source: zammad-storage
-        target: /opt/zammad/storage
-        type: volume
-        volume: {}
   zitadel:
     container_name: zitadel
     image: ghcr.io/zitadel/zitadel:latest
@@ -6810,10 +6456,6 @@ volumes:
     name: crowdsec-config
   crowdsec-db:
     name: crowdsec-db
-  dagu_config:
-    name: dagu_config
-  dagu_data:
-    name: dagu_data
   dbgate-data:
     name: dbgate-data
   fastenhealth-cache:
@@ -6826,12 +6468,6 @@ volumes:
     name: filebeat_var
   gitea-pg-db:
     name: gitea-pg-db
-  grafana-mimir-data:
-    name: grafana-mimir-data
-  grafana-tempo-data:
-    name: grafana-tempo-data
-  hortusfox_app_backup:
-    name: hortusfox_app_backup
   hortusfox_app_images:
     name: hortusfox_app_images
   hortusfox_app_logs:
@@ -6878,12 +6514,6 @@ volumes:
     name: netbird-signal
   netbird-letsencrypt:
     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:
@@ -6932,44 +6562,5 @@ volumes:
     name: wallos-db
   wallos-logos:
     name: wallos-logos
-  wazuh-dashboard-config:
-    name: wazuh-dashboard-config
-  wazuh-dashboard-custom:
-    name: wazuh-dashboard-custom
-  wazuh-indexer-data:
-    name: wazuh-indexer-data
-  wazuh_active_response:
-    name: wazuh_active_response
-  wazuh_agentless:
-    name: wazuh_agentless
-  wazuh_api_configuration:
-    name: wazuh_api_configuration
-  wazuh_etc:
-    name: wazuh_etc
-  wazuh_integrations:
-    name: wazuh_integrations
-  wazuh_logs:
-    name: wazuh_logs
-  wazuh_queue:
-    name: wazuh_queue
-  wazuh_var_multigroups:
-    name: wazuh_var_multigroups
-  wazuh_wodles:
-    name: wazuh_wodles
-  zammad-backup:
-    driver: local
-    name: zammad-backup
-  zammad-es-data:
-    driver: local
-    name: zammad-es-data
-  zammad-pg-data:
-    driver: local
-    name: zammad-pg-data
-  zammad-redis-data:
-    driver: local
-    name: zammad-redis-data
-  zammad-storage:
-    driver: local
-    name: zammad-storage
   zitadel-pg-db:
     name: zitadel-pg-db