Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2ee2c254ba | |||
| 8de441cc7c | |||
| 3ceba4cd90 | |||
| 621999eb2b | |||
| 88380a3769 | |||
| 1940785bbd | |||
| f3b8170790 | |||
| 5479724535 | |||
| b8cad2af5e | |||
| 0d405dac52 | |||
| 647361963b | |||
| 6dc6ba2531 |
@@ -314,7 +314,7 @@ jobs:
|
|||||||
- name: Login to Gitea Container Registry
|
- name: Login to Gitea Container Registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: gitea:3000
|
registry: http://192.168.1.254:3013
|
||||||
username: gitea-sonarqube-bot
|
username: gitea-sonarqube-bot
|
||||||
password: ${{ secrets.BOT_GITEA_TOKEN }}
|
password: ${{ secrets.BOT_GITEA_TOKEN }}
|
||||||
- name: Install hvac
|
- name: Install hvac
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
{% set vault_addr = 'https://vault.trez.wtf' %}
|
||||||
|
{% set secrets_path = 'rinoa-docker/env' %}
|
||||||
|
|
||||||
urls:
|
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'] }}
|
- 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
|
- 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
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
|
{% set vault_addr = 'https://vault.trez.wtf' %}
|
||||||
|
{% set secrets_path = 'rinoa-docker/env' %}
|
||||||
|
|
||||||
containers:
|
containers:
|
||||||
ghost_blog:
|
ghost_blog:
|
||||||
action_keywords:
|
action_keywords:
|
||||||
- restart:
|
- restart:
|
||||||
regex: '^Connection Error: Error: read ECONNRESET$'
|
regex: ':[0-9]{2}\] ERROR.*$'
|
||||||
immich-server:
|
immich-server:
|
||||||
action_keywords:
|
action_keywords:
|
||||||
- restart:
|
- restart:
|
||||||
|
|||||||
+148
-1
@@ -21,6 +21,65 @@ x-app-common: &jitsi_admin_app
|
|||||||
PHP_INI_MEMORY_LIMIT: "1G"
|
PHP_INI_MEMORY_LIMIT: "1G"
|
||||||
PHP_EXTENSION_LDAP: 1
|
PHP_EXTENSION_LDAP: 1
|
||||||
PHP_EXTENSION_INTL: 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:
|
services:
|
||||||
actual_server:
|
actual_server:
|
||||||
container_name: actualbudget
|
container_name: actualbudget
|
||||||
@@ -2313,7 +2372,7 @@ services:
|
|||||||
JIGASI_HEALTH_CHECK_INTERVAL:
|
JIGASI_HEALTH_CHECK_INTERVAL:
|
||||||
JIGASI_SIP_KEEP_ALIVE_METHOD:
|
JIGASI_SIP_KEEP_ALIVE_METHOD:
|
||||||
JIGASI_ENABLE_SDES_SRTP:
|
JIGASI_ENABLE_SDES_SRTP:
|
||||||
ENABLE_TRANSCRIPTIONS:
|
ENABLE_TRANSCRIPTIONS: 1
|
||||||
JIGASI_TRANSCRIBER_ADVERTISE_URL:
|
JIGASI_TRANSCRIBER_ADVERTISE_URL:
|
||||||
JIGASI_TRANSCRIBER_RECORD_AUDIO:
|
JIGASI_TRANSCRIBER_RECORD_AUDIO:
|
||||||
JIGASI_TRANSCRIBER_SEND_TXT:
|
JIGASI_TRANSCRIBER_SEND_TXT:
|
||||||
@@ -2432,6 +2491,7 @@ services:
|
|||||||
JICOFO_COMPONENT_SECRET:
|
JICOFO_COMPONENT_SECRET:
|
||||||
JIGASI_XMPP_USER:
|
JIGASI_XMPP_USER:
|
||||||
JIGASI_XMPP_PASSWORD: ${JITSI__JIGASI_XMPP_PASSWORD}
|
JIGASI_XMPP_PASSWORD: ${JITSI__JIGASI_XMPP_PASSWORD}
|
||||||
|
JIGASI_TRANSCRIBER_PASSWORD: ${JITSI__JIGASI_TRANSCRIBER_PASSWORD}
|
||||||
JVB_AUTH_USER:
|
JVB_AUTH_USER:
|
||||||
JVB_AUTH_PASSWORD: ${JITSI__JVB_AUTH_PASSWORD}
|
JVB_AUTH_PASSWORD: ${JITSI__JVB_AUTH_PASSWORD}
|
||||||
JWT_APP_ID:
|
JWT_APP_ID:
|
||||||
@@ -5241,6 +5301,83 @@ services:
|
|||||||
source: /rinoa-storage
|
source: /rinoa-storage
|
||||||
target: /storage
|
target: /storage
|
||||||
type: bind
|
type: bind
|
||||||
|
zammad-backup:
|
||||||
|
<<: *zammad-service
|
||||||
|
command: ["zammad-backup"]
|
||||||
|
volumes:
|
||||||
|
- zammad-backup:/var/tmp/zammad
|
||||||
|
- zammad-storage:/opt/zammad/storage:ro
|
||||||
|
user: 0:0
|
||||||
|
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
|
||||||
|
command: ["zammad-init"]
|
||||||
|
depends_on:
|
||||||
|
- zammad-postgresql
|
||||||
|
restart: on-failure
|
||||||
|
user: 0:0
|
||||||
|
zammad-memcached:
|
||||||
|
command: memcached -m 256M
|
||||||
|
image: memcached:${MEMCACHE_VERSION:-1.6.38-alpine}
|
||||||
|
restart: ${RESTART:-always}
|
||||||
|
zammad-nginx:
|
||||||
|
<<: *zammad-service
|
||||||
|
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:
|
||||||
|
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
|
||||||
|
command: ["zammad-railsserver"]
|
||||||
|
zammad-redis:
|
||||||
|
image: redis:${REDIS_VERSION:-7.4.2-alpine}
|
||||||
|
restart: ${RESTART:-always}
|
||||||
|
volumes:
|
||||||
|
- zammad-redis-data:/data
|
||||||
|
zammad-scheduler:
|
||||||
|
<<: *zammad-service
|
||||||
|
command: ["zammad-scheduler"]
|
||||||
|
zammad-websocket:
|
||||||
|
<<: *zammad-service
|
||||||
|
command: ["zammad-websocket"]
|
||||||
volumes:
|
volumes:
|
||||||
authelia-pg-db:
|
authelia-pg-db:
|
||||||
name: authelia-pg-db
|
name: authelia-pg-db
|
||||||
@@ -5380,3 +5517,13 @@ volumes:
|
|||||||
name: wallos-db
|
name: wallos-db
|
||||||
wallos-logos:
|
wallos-logos:
|
||||||
name: 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
|
||||||
Reference in New Issue
Block a user