|
|
@@ -101,7 +101,7 @@ services:
|
|
|
- rspamd
|
|
|
|
|
|
php-fpm-mailcow:
|
|
|
- image: mailcow/phpfpm:1.69
|
|
|
+ image: mailcow/phpfpm:1.70
|
|
|
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
|
|
|
depends_on:
|
|
|
- redis-mailcow
|
|
|
@@ -122,6 +122,7 @@ services:
|
|
|
- ./data/conf/dovecot/global_sieve_before:/global_sieve/before:z
|
|
|
- ./data/conf/dovecot/global_sieve_after:/global_sieve/after:z
|
|
|
- ./data/assets/templates:/tpls:z
|
|
|
+ - ./data/conf/ejabberd/autogen:/ejabberd/:z
|
|
|
dns:
|
|
|
- ${IPV4_NETWORK:-172.22.1}.254
|
|
|
environment:
|
|
|
@@ -144,6 +145,8 @@ services:
|
|
|
- SUBMISSION_PORT=${SUBMISSION_PORT:-587}
|
|
|
- SMTPS_PORT=${SMTPS_PORT:-465}
|
|
|
- SMTP_PORT=${SMTP_PORT:-25}
|
|
|
+ - XMPP_C22_PORT=${XMPP_C22_PORT:-5222}
|
|
|
+ - XMPP_S2S_PORT=${XMPP_S2S_PORT:-5269}
|
|
|
- API_KEY=${API_KEY:-invalid}
|
|
|
- API_KEY_READ_ONLY=${API_KEY_READ_ONLY:-invalid}
|
|
|
- API_ALLOW_FROM=${API_ALLOW_FROM:-invalid}
|
|
|
@@ -518,6 +521,38 @@ services:
|
|
|
aliases:
|
|
|
- olefy
|
|
|
|
|
|
+ ejabberd-mailcow:
|
|
|
+ image: mailcow/ejabberd:1.0
|
|
|
+ volumes:
|
|
|
+ - ./data/conf/ejabberd/ejabberd.yml:/home/ejabberd/conf/ejabberd.yml:z
|
|
|
+ - xmpp-vol-1:/home/ejabberd/database:z
|
|
|
+ - xmpp-upload-vol-1:/var/www/upload:z
|
|
|
+ - ./data/assets/ejabberd/sqlite:/sqlite:z
|
|
|
+ - ./data/conf/ejabberd/autogen:/ejabberd/:z
|
|
|
+ - mysql-socket-vol-1:/var/run/mysqld/:z
|
|
|
+ restart: always
|
|
|
+ dns:
|
|
|
+ - ${IPV4_NETWORK:-172.22.1}.254
|
|
|
+ hostname: ejabberd.mailcow.local
|
|
|
+ extra_hosts:
|
|
|
+ - "${MAILCOW_HOSTNAME}:127.0.0.1"
|
|
|
+ environment:
|
|
|
+ - TZ=${TZ}
|
|
|
+ - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
|
|
|
+ - MASTER=${MASTER:-y}
|
|
|
+ - IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
|
|
|
+ - DBNAME=${DBNAME}
|
|
|
+ - DBUSER=${DBUSER}
|
|
|
+ - DBPASS=${DBPASS}
|
|
|
+ ports:
|
|
|
+ - "${XMPP_C22_PORT:-5222}:5222"
|
|
|
+ - "${XMPP_S2S_PORT:-5269}:5269"
|
|
|
+ - "${XMPP_HTTPS_PORT:-5443}:5443"
|
|
|
+ networks:
|
|
|
+ mailcow-network:
|
|
|
+ aliases:
|
|
|
+ - ejabberd
|
|
|
+
|
|
|
ipv6nat-mailcow:
|
|
|
depends_on:
|
|
|
- unbound-mailcow
|
|
|
@@ -572,3 +607,5 @@ volumes:
|
|
|
crypt-vol-1:
|
|
|
sogo-web-vol-1:
|
|
|
sogo-userdata-backup-vol-1:
|
|
|
+ xmpp-vol-1:
|
|
|
+ xmpp-upload-vol-1:
|
andryyy