Modification for private CR.

Merged by Trez.One

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

@@ -314,7 +314,7 @@ jobs:
       - name: Login to Gitea Container Registry
         uses: docker/login-action@v3
         with:
-          registry: gitea:3000
+          registry: git.trez.wtf
           username: gitea-sonarqube-bot
           password: ${{ secrets.BOT_GITEA_TOKEN }}
       - name: Install hvac

README.md

@@ -141,4 +141,14 @@
 | watchtower | ghcr.io/containrrr/watchtower:latest |
 | web-check | lissy93/web-check |
 | youtubedl | nbr23/youtube-dl-server:latest |
+| zammad-backup | ghcr.io/zammad/zammad:6.5.0-15 |
+| zammad-elasticsearch | bitnami/elasticsearch:8.17.4 |
+| zammad-init | ghcr.io/zammad/zammad:6.5.0-15 |
+| zammad-memcached | memcached:1.6.38-alpine |
+| zammad-nginx | ghcr.io/zammad/zammad:6.5.0-15 |
+| zammad-postgresql | postgres:17.4-alpine |
+| zammad-railsserver | ghcr.io/zammad/zammad:6.5.0-15 |
+| zammad-redis | redis:7.4.2-alpine |
+| zammad-scheduler | ghcr.io/zammad/zammad:6.5.0-15 |
+| zammad-websocket | ghcr.io/zammad/zammad:6.5.0-15 |
 

ansible/app-configs/apprise_apprise.yml.j2

@@ -1,3 +1,6 @@
+{% set vault_addr = 'https://vault.trez.wtf' %}
+{% set secrets_path = 'rinoa-docker/env' %}
+
 urls:
   - gotify://gotify/{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['APPRISE_GOTIFY_TOKEN'] }}
   - mailtos://{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['POSTAL_SMTP_AUTH_USER'] }}:{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['POSTAL_SMTP_AUTH_PASSWORD'] }}@trez.wtf25?smtp=postal-smtp&from=noreply@trez.wtf

ansible/app-configs/loggifly_config.yaml.j2

@@ -1,8 +1,11 @@
+{% set vault_addr = 'https://vault.trez.wtf' %}
+{% set secrets_path = 'rinoa-docker/env' %}
+
 containers:
   ghost_blog:
     action_keywords:
       - restart:
-          regex: '^Connection Error: Error: read ECONNRESET$'
+          regex: ':[0-9]{2}\] ERROR.*$'
   immich-server:
     action_keywords:
       - restart:

docker-compose.yml

@@ -21,6 +21,65 @@ x-app-common: &jitsi_admin_app
     PHP_INI_MEMORY_LIMIT: "1G"
     PHP_EXTENSION_LDAP: 1
     PHP_EXTENSION_INTL: 1
+x-shared:
+  zammad-service: &zammad-service
+    environment: &zammad-environment
+      MEMCACHE_SERVERS: ${ZAMMAD_MEMCACHE_SERVERS:-zammad-memcached:11211}
+      POSTGRESQL_DB: ${ZAMMAD_POSTGRES_DB:-zammad_production}
+      POSTGRESQL_HOST: ${ZAMMAD_POSTGRES_HOST:-zammad-postgresql}
+      POSTGRESQL_USER: ${ZAMMAD_POSTGRES_USER:-zammad}
+      POSTGRESQL_PASS: ${ZAMMAD_POSTGRES_PASS:-zammad}
+      POSTGRESQL_PORT: ${ZAMMAD_POSTGRES_PORT:-5432}
+      POSTGRESQL_OPTIONS: ${ZAMMAD_POSTGRESQL_OPTIONS:-?pool=50}
+      POSTGRESQL_DB_CREATE:
+      REDIS_URL: ${ZAMMAD_REDIS_URL:-redis://zammad-redis:6379}
+      S3_URL: http://${ZAMMAD_S3_ACCESS_KEY}:${ZAMMAD_S3_SECRET_KEY}@minio:9000/zammad-storage-bucket?region=us-east-fh-pln&force_path_style=true
+      # Backup settings
+      BACKUP_DIR: "${BACKUP_DIR:-/var/tmp/zammad}"
+      BACKUP_TIME: "${BACKUP_TIME:-03:00}"
+      HOLD_DAYS: "${HOLD_DAYS:-7}"
+      TZ: "${TZ:-Europe/Berlin}"
+      # Allow passing in these variables via .env:
+      AUTOWIZARD_JSON:
+      AUTOWIZARD_RELATIVE_PATH:
+      ELASTICSEARCH_ENABLED: false
+      ELASTICSEARCH_SCHEMA:
+      ELASTICSEARCH_HOST:
+      ELASTICSEARCH_PORT:
+      ELASTICSEARCH_USER: ${ELASTICSEARCH_USER:-elastic}
+      ELASTICSEARCH_PASS: ${ELASTICSEARCH_PASS:-zammad}
+      ELASTICSEARCH_NAMESPACE:
+      ELASTICSEARCH_REINDEX:
+      NGINX_PORT:
+      NGINX_EXPOSE_PORT: 15257
+      NGINX_CLIENT_MAX_BODY_SIZE:
+      NGINX_SERVER_NAME:
+      NGINX_SERVER_SCHEME:
+      RAILS_TRUSTED_PROXIES: 172.18.0.0/16
+      ZAMMAD_HTTP_TYPE:
+      ZAMMAD_FQDN:
+      ZAMMAD_WEB_CONCURRENCY:
+      ZAMMAD_PROCESS_SESSIONS_JOBS_WORKERS:
+      ZAMMAD_PROCESS_SCHEDULED_JOBS_WORKERS:
+      ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS:
+      # ZAMMAD_SESSION_JOBS_CONCURRENT is deprecated, please use ZAMMAD_PROCESS_SESSIONS_JOBS_WORKERS instead.
+      ZAMMAD_SESSION_JOBS_CONCURRENT:
+      # Variables used by ngingx-proxy container for reverse proxy creations
+      # for docs refer to https://github.com/nginx-proxy/nginx-proxy
+      VIRTUAL_HOST:
+      VIRTUAL_PORT:
+      # Variables used by acme-companion for retrieval of LetsEncrypt certificate
+      # for docs refer to https://github.com/nginx-proxy/acme-companion
+      LETSENCRYPT_HOST:
+      LETSENCRYPT_EMAIL:
+    image: ${IMAGE_REPO:-ghcr.io/zammad/zammad}:${VERSION:-6.5.0-15}
+    restart: ${RESTART:-always}
+    volumes:
+      - zammad-storage:/opt/zammad/storage
+    depends_on:
+      - zammad-memcached
+      - zammad-postgresql
+      - zammad-redis
 services:
   actual_server:
     container_name: actualbudget
@@ -2064,6 +2123,104 @@ services:
         type: bind
         bind:
           create_host_path: true
+  invoice-ninja:
+    container_name: invoice-ninja
+    depends_on:
+      mariadb:
+        condition: service_started
+        required: true
+        restart: true
+    environment:
+      APP_DEBUG: true
+      APP_KEY: ${IN_APP_KEY}
+      APP_URL: http://invoice_ninja:8003
+      APP_ENV: /var/www/html/.env
+      DB_DATABASE: invoice_ninja
+      DB_HOST: mariadb
+      DB_PASSWORD: ${IN_MYSQL_PASSWORD}
+      DB_PORT: 3306
+      DB_USERNAME: ininja
+      IN_PASSWORD: ${IN_PASSWORD}
+      IN_USER_EMAIL: charish.patel@${MY_TLD}
+      MAIL_ENCRYPTION: null
+      MAIL_FROM_ADDRESS: noreply@${MY_TLD}
+      MAIL_FROM_NAME: null
+      MAIL_HOST: postal-smtp
+      MAIL_MAILER: log
+      MAIL_PASSWORD: ${POSTAL_SMTP_AUTH_PASSWORD}
+      MAIL_PORT: 25
+      MAIL_USERNAME: ${POSTAL_SMTP_AUTH_USER}
+      MYSQL_DATABASE: invoice_ninja
+      MYSQL_PASSWORD: ${IN_MYSQL_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ${MARIADB_ENVIRONMENT_MYSQL_ROOT_PASSWORD}
+      MYSQL_USER: ininja
+      PDF_GENERATOR: snappdf
+      PHANTOMJS_PDF_GENERATION: false
+      QUEUE_CONNECTION: database
+      REQUIRE_HTTPS: false
+      TRUSTED_PROXIES: 172.18.0.0/16
+    expose:
+      - 9000
+    image: invoiceninja/invoiceninja-debian:5
+    restart: always
+    volumes:
+      - invoice-ninja_cache:/var/www/html/bootstrap/cache
+      - invoice-ninja_public:/var/www/html/public
+      - invoice-ninja_storage:/var/www/html/storage
+  invoice-ninja_proxy:
+    container_name: invoice-ninja_proxy
+    depends_on:
+      invoice-ninja:
+        condition: service_started
+        required: true
+        restart: true
+    environment:
+      APP_DEBUG: true
+      APP_KEY: ${IN_APP_KEY}
+      APP_URL: http://invoice_ninja:9000
+      DB_DATABASE: invoice_ninja
+      DB_HOST: mariadb
+      DB_PASSWORD: ${IN_MYSQL_PASSWORD}
+      DB_PORT: 3306
+      DB_USERNAME: ininja
+      IN_PASSWORD: ${IN_PASSWORD}
+      IN_USER_EMAIL: charish.patel@trez.wtf
+      MAIL_ENCRYPTION: null
+      MAIL_FROM_ADDRESS: noreply@trez.wtf
+      MAIL_FROM_NAME: null
+      MAIL_HOST: postal-smtp
+      MAIL_MAILER: log
+      MAIL_PASSWORD: ${POSTAL_SMTP_AUTH_PASSWORD}
+      MAIL_PORT: 25
+      MAIL_USERNAME: ${POSTAL_SMTP_AUTH_USER}
+      MYSQL_DATABASE: invoice_ninja
+      MYSQL_PASSWORD: ${IN_MYSQL_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ${MARIADB_ENVIRONMENT_MYSQL_ROOT_PASSWORD}
+      MYSQL_USER: ininja
+      PDF_GENERATOR: snappdf
+      PHANTOMJS_PDF_GENERATION: false
+      QUEUE_CONNECTION: database
+      REQUIRE_HTTPS: false
+      TRUSTED_PROXIES: 172.18.0.0/16
+    image: nginx
+    labels:
+      swag: enable
+      swag_proto: http
+      swag_url: biz.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://biz.${MY_TLD}
+      homepage.group: Professional Services
+      homepage.name: Invoice Ninja
+      homepage.href: https://biz.${MY_TLD}
+      homepage.icon: invoice-ninja.svg
+      homepage.description: Simple invoicing, multiple payment options, expense and vendor management, and more!
+    ports:
+      - 8005:80
+    restart: always
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/invoice-ninja/nginx:/etc/nginx/conf.d:ro
+      - invoice-ninja_public:/var/www/html/public
+      - invoice-ninja_storage:/var/www/html/storage
   it-tools:
     container_name: it-tools
     image: ghcr.io/corentinth/it-tools:latest
@@ -2313,7 +2470,7 @@ services:
       JIGASI_HEALTH_CHECK_INTERVAL:
       JIGASI_SIP_KEEP_ALIVE_METHOD:
       JIGASI_ENABLE_SDES_SRTP:
-      ENABLE_TRANSCRIPTIONS:
+      ENABLE_TRANSCRIPTIONS: 1
       JIGASI_TRANSCRIBER_ADVERTISE_URL:
       JIGASI_TRANSCRIBER_RECORD_AUDIO:
       JIGASI_TRANSCRIBER_SEND_TXT:
@@ -2432,6 +2589,7 @@ services:
       JICOFO_COMPONENT_SECRET:
       JIGASI_XMPP_USER:
       JIGASI_XMPP_PASSWORD: ${JITSI__JIGASI_XMPP_PASSWORD}
+      JIGASI_TRANSCRIBER_PASSWORD: ${JITSI__JIGASI_TRANSCRIBER_PASSWORD}
       JVB_AUTH_USER:
       JVB_AUTH_PASSWORD: ${JITSI__JVB_AUTH_PASSWORD}
       JWT_APP_ID:
@@ -5241,6 +5399,93 @@ services:
         source: /rinoa-storage
         target: /storage
         type: bind
+  zammad-backup:
+    <<: *zammad-service
+    container_name: zammad-backup
+    command: ["zammad-backup"]
+    volumes:
+      - zammad-backup:/var/tmp/zammad
+      - zammad-storage:/opt/zammad/storage:ro
+    user: 0:0
+  zammad-elasticsearch:
+    container_name: zammad-elasticsearch
+    image: bitnami/elasticsearch:${ELASTICSEARCH_VERSION:-8.17.4}
+    restart: ${RESTART:-always}
+    profiles:
+      - do-not-start
+    volumes:
+      - zammad-elasticsearch-data:/bitnami/elasticsearch/data
+    environment:
+      # Enable authorization without HTTPS. For external access with
+      #   SSL termination, use solutions like nginx-proxy-manager.
+      ELASTICSEARCH_ENABLE_SECURITY: 'true'
+      ELASTICSEARCH_SKIP_TRANSPORT_TLS: 'true'
+      ELASTICSEARCH_ENABLE_REST_TLS: 'false'
+      # ELASTICSEARCH_USER is hardcoded to 'elastic' in the container.
+      ELASTICSEARCH_PASSWORD: ${ELASTICSEARCH_PASS:-zammad}
+  zammad-init:
+    <<: *zammad-service
+    container_name: zammad-init
+    command: ["zammad-init"]
+    depends_on:
+      - zammad-postgresql
+    restart: on-failure
+    user: 0:0
+  zammad-memcached:
+    container_name: zammad-memcached
+    command: memcached -m 256M
+    image: memcached:${MEMCACHE_VERSION:-1.6.38-alpine}
+    restart: ${RESTART:-always}
+  zammad-nginx:
+    <<: *zammad-service
+    container_name: zammad-nginx
+    command: ["zammad-nginx"]
+    expose:
+      - "${NGINX_PORT:-8080}"
+    ports:
+      - "${NGINX_EXPOSE_PORT:-8080}:${NGINX_PORT:-8080}"
+    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: Personal/Professional Services
+      homepage.name: Zammad
+      homepage.href: https://support.${MY_TLD}
+      homepage.icon: zammad.svg
+      homepage.description: Open-source helpdesk/customer support system
+    depends_on:
+      - zammad-railsserver
+  zammad-postgresql:
+    container_name: zammad-postgresql
+    environment:
+      POSTGRES_DB: ${ZAMMAD_POSTGRES_DB:-zammad_production}
+      POSTGRES_USER: ${ZAMMAD_POSTGRES_USER:-zammad}
+      POSTGRES_PASSWORD: ${ZAMMAD_POSTGRES_PASS:-zammad}
+    image: postgres:${ZAMMAD_POSTGRES_VERSION:-17.4-alpine}
+    restart: ${RESTART:-always}
+    volumes:
+      - zammad-postgresql-data:/var/lib/postgresql/data
+  zammad-railsserver:
+    <<: *zammad-service
+    container_name: zammad-railsserver
+    command: ["zammad-railsserver"]
+  zammad-redis:
+    container_name: zammad-redis
+    image: redis:${REDIS_VERSION:-7.4.2-alpine}
+    restart: ${RESTART:-always}
+    volumes:
+      - zammad-redis-data:/data
+  zammad-scheduler:
+    <<: *zammad-service
+    container_name: zammad-scheduler
+    command: ["zammad-scheduler"]
+  zammad-websocket:
+    <<: *zammad-service
+    container_name: zammad-websocket
+    command: ["zammad-websocket"]
 volumes:
   authelia-pg-db:
     name: authelia-pg-db
@@ -5380,3 +5625,13 @@ volumes:
     name: wallos-db
   wallos-logos:
     name: wallos-logos
+  zammad-backup:
+    name: zammad-backup
+  zammad-storage:
+    name: zammad-storage
+  zammad-elasticsearch-data:
+    name: zammad-elasticsearch-data
+  zammad-postgresql-data:
+    name: zammad-postgresql-data
+  zammad-redis-data:
+    name: zammad-redis-data