paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Compose] Remove ejabberd from compose and update Dovecot

master
andryyy 2021-06-30 10:14:10 +02:00
parent 8b08d09ca2
commit f078a514f0
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
1 changed files with 1 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
docker-compose.yml
View File

@ -122,7 +122,6 @@ services:
- ./data/conf/dovecot/global_sieve_before:/global_sieve/before:z - ./data/conf/dovecot/global_sieve_before:/global_sieve/before:z
- ./data/conf/dovecot/global_sieve_after:/global_sieve/after:z - ./data/conf/dovecot/global_sieve_after:/global_sieve/after:z
- ./data/assets/templates:/tpls:z - ./data/assets/templates:/tpls:z
- ./data/conf/ejabberd/autogen:/ejabberd/:z
- ./data/conf/nginx/:/etc/nginx/conf.d/:z - ./data/conf/nginx/:/etc/nginx/conf.d/:z
dns: dns:
- ${IPV4_NETWORK:-172.22.1}.254 - ${IPV4_NETWORK:-172.22.1}.254
@ -146,8 +145,6 @@ services:
- SUBMISSION_PORT=${SUBMISSION_PORT:-587} - SUBMISSION_PORT=${SUBMISSION_PORT:-587}
- SMTPS_PORT=${SMTPS_PORT:-465} - SMTPS_PORT=${SMTPS_PORT:-465}
- SMTP_PORT=${SMTP_PORT:-25} - SMTP_PORT=${SMTP_PORT:-25}
- XMPP_C2S_PORT=${XMPP_C2S_PORT:-5222}
- XMPP_S2S_PORT=${XMPP_S2S_PORT:-5269}
- API_KEY=${API_KEY:-invalid} - API_KEY=${API_KEY:-invalid}
- API_KEY_READ_ONLY=${API_KEY_READ_ONLY:-invalid} - API_KEY_READ_ONLY=${API_KEY_READ_ONLY:-invalid}
- API_ALLOW_FROM=${API_ALLOW_FROM:-invalid} - API_ALLOW_FROM=${API_ALLOW_FROM:-invalid}
@ -210,7 +207,7 @@ services:
- sogo - sogo
dovecot-mailcow: dovecot-mailcow:
image: mailcow/dovecot:1.151 image: mailcow/dovecot:1.152
depends_on: depends_on:
- mysql-mailcow - mysql-mailcow
dns: dns:
@ -354,7 +351,6 @@ services:
until ping sogo -c1 > /dev/null; do sleep 1; done && until ping sogo -c1 > /dev/null; do sleep 1; done &&
until ping redis -c1 > /dev/null; do sleep 1; done && until ping redis -c1 > /dev/null; do sleep 1; done &&
until ping rspamd -c1 > /dev/null; do sleep 1; done && until ping rspamd -c1 > /dev/null; do sleep 1; done &&
until ping ejabberd -c1 > /dev/null; do sleep 1; done &&
exec nginx -g 'daemon off;'" exec nginx -g 'daemon off;'"
environment: environment:
- HTTPS_PORT=${HTTPS_PORT:-443} - HTTPS_PORT=${HTTPS_PORT:-443}
@ -557,44 +553,6 @@ services:
aliases: aliases:
- olefy - olefy
ejabberd-mailcow:
image: mailcow/ejabberd:1.6
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
- ./data/assets/ssl:/ssl:ro,z
restart: always
dns:
- ${IPV4_NETWORK:-172.22.1}.254
hostname: ejabberd.mailcow.local
labels:
ofelia.enabled: "true"
ofelia.job-exec.ejabberd_certs.schedule: "@every 168h"
ofelia.job-exec.ejabberd_certs.command: "/sbin/su-exec ejabberd /home/ejabberd/bin/ejabberdctl --node ejabberd@$${MAILCOW_HOSTNAME} request-certificate all"
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}
- XMPP_HTTPS_PORT=${XMPP_HTTPS_PORT:-5443}
- DBNAME=${DBNAME}
- DBUSER=${DBUSER}
- DBPASS=${DBPASS}
ports:
- "${XMPP_C2S_PORT:-5222}:5222"
- "${XMPP_S2S_PORT:-5269}:5269"
- "${XMPP_HTTPS_PORT:-5443}:5443"
networks:
mailcow-network:
aliases:
- ejabberd
ofelia-mailcow: ofelia-mailcow:
image: mcuadros/ofelia:latest image: mcuadros/ofelia:latest
restart: always restart: always
@ -603,7 +561,6 @@ services:
depends_on: depends_on:
- sogo-mailcow - sogo-mailcow
- dovecot-mailcow - dovecot-mailcow
- ejabberd-mailcow
labels: labels:
ofelia.enabled: "true" ofelia.enabled: "true"
volumes: volumes:
@ -667,5 +624,3 @@ volumes:
crypt-vol-1: crypt-vol-1:
sogo-web-vol-1: sogo-web-vol-1:
sogo-userdata-backup-vol-1: sogo-userdata-backup-vol-1:
xmpp-vol-1:
xmpp-upload-vol-1: