126 lines
3.6 KiB
Diff
126 lines
3.6 KiB
Diff
--- docker-compose-original.yml 2023-01-09 13:46:07.792778709 +0100
|
|
+++ docker-compose.yml 2023-01-09 13:45:20.828836564 +0100
|
|
@@ -55,8 +55,8 @@
|
|
- "${REDIS_PORT:-127.0.0.1:7654}:6379"
|
|
environment:
|
|
- TZ=${TZ}
|
|
- sysctls:
|
|
- - net.core.somaxconn=4096
|
|
+# sysctls:
|
|
+# - net.core.somaxconn=4096
|
|
networks:
|
|
mailcow-network:
|
|
ipv4_address: ${IPV4_NETWORK:-172.22.1}.249
|
|
@@ -68,8 +68,8 @@
|
|
restart: always
|
|
depends_on:
|
|
- unbound-mailcow
|
|
- dns:
|
|
- - ${IPV4_NETWORK:-172.22.1}.254
|
|
+# dns:
|
|
+# - ${IPV4_NETWORK:-172.22.1}.254
|
|
environment:
|
|
- TZ=${TZ}
|
|
- SKIP_CLAMD=${SKIP_CLAMD:-n}
|
|
@@ -108,8 +108,8 @@
|
|
- label=disable
|
|
restart: always
|
|
hostname: rspamd
|
|
- dns:
|
|
- - ${IPV4_NETWORK:-172.22.1}.254
|
|
+# dns:
|
|
+# - ${IPV4_NETWORK:-172.22.1}.254
|
|
networks:
|
|
mailcow-network:
|
|
aliases:
|
|
@@ -140,8 +140,8 @@
|
|
- ./data/conf/nginx/:/etc/nginx/conf.d/
|
|
security_opt:
|
|
- label=disable
|
|
- dns:
|
|
- - ${IPV4_NETWORK:-172.22.1}.254
|
|
+# dns:
|
|
+# - ${IPV4_NETWORK:-172.22.1}.254
|
|
environment:
|
|
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
|
|
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
|
|
@@ -198,8 +198,8 @@
|
|
- MASTER=${MASTER:-y}
|
|
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
|
|
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
|
|
- dns:
|
|
- - ${IPV4_NETWORK:-172.22.1}.254
|
|
+# dns:
|
|
+# - ${IPV4_NETWORK:-172.22.1}.254
|
|
volumes:
|
|
- ./data/hooks/sogo:/hooks
|
|
- ./data/conf/sogo/:/etc/sogo/
|
|
@@ -233,8 +233,8 @@
|
|
image: mailcow/dovecot:1.21
|
|
depends_on:
|
|
- mysql-mailcow
|
|
- dns:
|
|
- - ${IPV4_NETWORK:-172.22.1}.254
|
|
+# dns:
|
|
+# - ${IPV4_NETWORK:-172.22.1}.254
|
|
cap_add:
|
|
- NET_BIND_SERVICE
|
|
volumes:
|
|
@@ -341,8 +341,8 @@
|
|
- "${SMTPS_PORT:-465}:465"
|
|
- "${SUBMISSION_PORT:-587}:587"
|
|
restart: always
|
|
- dns:
|
|
- - ${IPV4_NETWORK:-172.22.1}.254
|
|
+# dns:
|
|
+# - ${IPV4_NETWORK:-172.22.1}.254
|
|
networks:
|
|
mailcow-network:
|
|
ipv4_address: ${IPV4_NETWORK:-172.22.1}.253
|
|
@@ -367,8 +367,8 @@
|
|
- php-fpm-mailcow
|
|
- redis-mailcow
|
|
image: nginx:mainline-alpine
|
|
- dns:
|
|
- - ${IPV4_NETWORK:-172.22.1}.254
|
|
+# dns:
|
|
+# - ${IPV4_NETWORK:-172.22.1}.254
|
|
command: /bin/sh -c "envsubst < /etc/nginx/conf.d/templates/listen_plain.template > /etc/nginx/conf.d/listen_plain.active &&
|
|
envsubst < /etc/nginx/conf.d/templates/listen_ssl.template > /etc/nginx/conf.d/listen_ssl.active &&
|
|
envsubst < /etc/nginx/conf.d/templates/sogo.template > /etc/nginx/conf.d/sogo.active &&
|
|
@@ -412,8 +412,8 @@
|
|
depends_on:
|
|
- nginx-mailcow
|
|
image: mailcow/acme:1.83
|
|
- dns:
|
|
- - ${IPV4_NETWORK:-172.22.1}.254
|
|
+# dns:
|
|
+# - ${IPV4_NETWORK:-172.22.1}.254
|
|
environment:
|
|
- LOG_LINES=${LOG_LINES:-9999}
|
|
- ACME_CONTACT=${ACME_CONTACT:-}
|
|
@@ -475,8 +475,8 @@
|
|
|
|
watchdog-mailcow:
|
|
image: mailcow/watchdog:1.97
|
|
- dns:
|
|
- - ${IPV4_NETWORK:-172.22.1}.254
|
|
+# dns:
|
|
+# - ${IPV4_NETWORK:-172.22.1}.254
|
|
tmpfs:
|
|
- /tmp
|
|
volumes:
|
|
@@ -542,9 +542,9 @@
|
|
security_opt:
|
|
- label=disable
|
|
restart: always
|
|
- oom_kill_disable: true
|
|
- dns:
|
|
- - ${IPV4_NETWORK:-172.22.1}.254
|
|
+# oom_kill_disable: true
|
|
+# dns:
|
|
+# - ${IPV4_NETWORK:-172.22.1}.254
|
|
environment:
|
|
- DBROOT=${DBROOT}
|
|
- TZ=${TZ}
|