envfile

data/conf/postfix/main.cf

@@ -199,5 +199,5 @@ parent_domain_matches_subdomains = debug_peer_list,fast_flush_domains,mynetworks
 # DO NOT EDIT ANYTHING BELOW #
 # User overrides #
 
-myhostname = mail.marcpartensky.com
+myhostname = marcpartensky.com
 

docker-compose.yml

@@ -3,12 +3,11 @@ services:
 
     unbound-mailcow:
       image: mailcow/unbound:1.15
-      restart: unless-stopped
-      environment:
-        TZ: ${TZ}
+      env_file: mailcow.conf
       volumes:
         - ./data/hooks/unbound:/hooks:Z
         - ./data/conf/unbound/unbound.conf:/etc/unbound/unbound.conf:ro,Z
+      restart: unless-stopped
       tty: true
       networks:
         mailcow-network:
@@ -18,7 +17,6 @@ services:
 
     mysql-mailcow:
       image: mariadb:10.5
-      restart: unless-stopped
       depends_on:
         - unbound-mailcow
       stop_grace_period: 45s
@@ -26,13 +24,8 @@ services:
         - mysql-vol-1:/var/lib/mysql/:Z
         - mysql-socket-vol-1:/var/run/mysqld/:z
         - ./data/conf/mysql/:/etc/mysql/conf.d/:ro,Z
-      environment:
-        TZ: ${TZ}
-        MYSQL_ROOT_PASSWORD: ${DBROOT}
-        MYSQL_DATABASE: ${DBNAME}
-        MYSQL_USER: ${DBUSER}
-        MYSQL_PASSWORD: ${DBPASS}
-        MYSQL_INITDB_SKIP_TZINFO: 1
+      env_file: mailcow.conf
+      restart: unless-stopped
       ports:
         - "${SQL_PORT:-127.0.0.1:13306}:3306"
       networks:
@@ -42,13 +35,12 @@ services:
 
     redis-mailcow:
       image: redis:6-alpine
-      restart: unless-stopped
       volumes:
         - redis-vol-1:/data/:Z
+      restart: unless-stopped
       ports:
         - "${REDIS_PORT:-127.0.0.1:7654}:6379"
-      environment:
-        TZ: ${TZ}
+      env_file: mailcow.conf
       sysctls:
         - net.core.somaxconn=4096
       networks:
@@ -62,9 +54,7 @@ services:
       restart: unless-stopped
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
-      environment:
-        TZ: ${TZ}
-        SKIP_CLAMD: ${SKIP_CLAMD:-n}
+      env_file: mailcow.conf
       volumes:
         - ./data/conf/clamav/:/etc/clamav/:Z
       networks:
@@ -74,16 +64,10 @@ services:
 
     rspamd-mailcow:
       image: mailcow/rspamd:1.79
-      restart: unless-stopped
       stop_grace_period: 30s
       depends_on:
         - dovecot-mailcow
-      environment:
-        TZ: ${TZ}
-        IPV4_NETWORK: ${IPV4_NETWORK:-172.22.1}
-        IPV6_NETWORK: ${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
-        REDIS_SLAVEOF_IP: ${REDIS_SLAVEOF_IP:-}
-        REDIS_SLAVEOF_PORT: ${REDIS_SLAVEOF_PORT:-}
+      env_file: mailcow.conf
       volumes:
         - ./data/hooks/rspamd:/hooks:Z
         - ./data/conf/rspamd/custom/:/etc/rspamd/custom:z
@@ -94,6 +78,7 @@ services:
         - ./data/conf/rspamd/rspamd.conf.local:/etc/rspamd/rspamd.conf.local:Z
         - ./data/conf/rspamd/rspamd.conf.override:/etc/rspamd/rspamd.conf.override:Z
         - rspamd-vol-1:/var/lib/rspamd:z
+      restart: unless-stopped
       hostname: rspamd
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
@@ -104,7 +89,6 @@ services:
 
     php-fpm-mailcow:
       image: mailcow/phpfpm:1.78
-      restart: unless-stopped
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       depends_on:
         - redis-mailcow
@@ -128,37 +112,8 @@ services:
         - ./data/conf/nginx/:/etc/nginx/conf.d/:z
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
-      environment:
-        REDIS_SLAVEOF_IP: ${REDIS_SLAVEOF_IP:-}
-        REDIS_SLAVEOF_PORT: ${REDIS_SLAVEOF_PORT:-}
-        LOG_LINES: ${LOG_LINES:-9999}
-        TZ: ${TZ}
-        DBNAME: ${DBNAME}
-        DBUSER: ${DBUSER}
-        DBPASS: ${DBPASS}
-        MAILCOW_HOSTNAME: ${MAILCOW_HOSTNAME}
-        MAILCOW_PASS_SCHEME: ${MAILCOW_PASS_SCHEME:-BLF-CRYPT}
-        IMAP_PORT: ${IMAP_PORT:-143}
-        IMAPS_PORT: ${IMAPS_PORT:-993}
-        POP_PORT: ${POP_PORT:-110}
-        POPS_PORT: ${POPS_PORT:-995}
-        SIEVE_PORT: ${SIEVE_PORT:-4190}
-        IPV4_NETWORK: ${IPV4_NETWORK:-172.22.1}
-        IPV6_NETWORK: ${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
-        SUBMISSION_PORT: ${SUBMISSION_PORT:-587}
-        SMTPS_PORT: ${SMTPS_PORT:-465}
-        SMTP_PORT: ${SMTP_PORT:-25}
-        API_KEY: ${API_KEY:-invalid}
-        API_KEY_READ_ONLY: ${API_KEY_READ_ONLY:-invalid}
-        API_ALLOW_FROM: ${API_ALLOW_FROM:-invalid}
-        COMPOSE_PROJECT_NAME: ${COMPOSE_PROJECT_NAME:-mailcow-dockerized}
-        SKIP_SOLR: ${SKIP_SOLR:-y}
-        SKIP_CLAMD: ${SKIP_CLAMD:-n}
-        SKIP_SOGO: ${SKIP_SOGO:-n}
-        ALLOW_ADMIN_EMAIL_LOGIN: ${ALLOW_ADMIN_EMAIL_LOGIN:-n}
-        MASTER: ${MASTER:-y}
-        DEV_MODE: ${DEV_MODE:-n}
-        WEBAUTHN_ONLY_TRUSTED_VENDORS: ${WEBAUTHN_ONLY_TRUSTED_VENDORS:-n}
+      env_file: mailcow.conf
+      restart: unless-stopped
       networks:
         mailcow-network:
           aliases:
@@ -166,23 +121,7 @@ services:
 
     sogo-mailcow:
       image: mailcow/sogo:1.106
-      restart: unless-stopped
-      environment:
-        DBNAME: ${DBNAME}
-        DBUSER: ${DBUSER}
-        DBPASS: ${DBPASS}
-        TZ: ${TZ}
-        LOG_LINES: ${LOG_LINES:-9999}
-        MAILCOW_HOSTNAME: ${MAILCOW_HOSTNAME}
-        MAILCOW_PASS_SCHEME: ${MAILCOW_PASS_SCHEME:-BLF-CRYPT}
-        ACL_ANYONE: ${ACL_ANYONE:-disallow}
-        ALLOW_ADMIN_EMAIL_LOGIN: ${ALLOW_ADMIN_EMAIL_LOGIN:-n}
-        IPV4_NETWORK: ${IPV4_NETWORK:-172.22.1}
-        SOGO_EXPIRE_SESSION: ${SOGO_EXPIRE_SESSION:-480}
-        SKIP_SOGO: ${SKIP_SOGO:-n}
-        MASTER: ${MASTER:-y}
-        REDIS_SLAVEOF_IP: ${REDIS_SLAVEOF_IP:-}
-        REDIS_SLAVEOF_PORT: ${REDIS_SLAVEOF_PORT:-}
+      env_file: mailcow.conf
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       volumes:
@@ -205,6 +144,7 @@ services:
         ofelia.job-exec.sogo_eautoreply.command: "/bin/bash -c \"[[ $${MASTER} == y ]] && /usr/local/bin/gosu sogo /usr/sbin/sogo-tool update-autoreply -p /etc/sogo/sieve.creds || exit 0\""
         ofelia.job-exec.sogo_backup.schedule: "@every 24h"
         ofelia.job-exec.sogo_backup.command: "/bin/bash -c \"[[ $${MASTER} == y ]] && /usr/local/bin/gosu sogo /usr/sbin/sogo-tool backup /sogo_backup ALL || exit 0\""
+      restart: unless-stopped
       networks:
         mailcow-network:
           ipv4_address: ${IPV4_NETWORK:-172.22.1}.248
@@ -213,7 +153,6 @@ services:
 
     dovecot-mailcow:
       image: mailcow/dovecot:1.159
-      restart: unless-stopped
       depends_on:
         - mysql-mailcow
       dns:
@@ -233,26 +172,7 @@ services:
         - ./data/assets/templates:/templates:z
         - rspamd-vol-1:/var/lib/rspamd:z
         - mysql-socket-vol-1:/var/run/mysqld/:z
-      environment:
-        DOVECOT_MASTER_USER: ${DOVECOT_MASTER_USER:-}
-        DOVECOT_MASTER_PASS: ${DOVECOT_MASTER_PASS:-}
-        LOG_LINES: ${LOG_LINES:-9999}
-        DBNAME: ${DBNAME}
-        DBUSER: ${DBUSER}
-        DBPASS: ${DBPASS}
-        TZ: ${TZ}
-        MAILCOW_HOSTNAME: ${MAILCOW_HOSTNAME}
-        MAILCOW_PASS_SCHEME: ${MAILCOW_PASS_SCHEME:-BLF-CRYPT}
-        IPV4_NETWORK: ${IPV4_NETWORK:-172.22.1}
-        ALLOW_ADMIN_EMAIL_LOGIN: ${ALLOW_ADMIN_EMAIL_LOGIN:-n}
-        MAILDIR_GC_TIME: ${MAILDIR_GC_TIME:-7200}
-        ACL_ANYONE: ${ACL_ANYONE:-disallow}
-        SKIP_SOLR: ${SKIP_SOLR:-y}
-        MAILDIR_SUB: ${MAILDIR_SUB:-}
-        MASTER: ${MASTER:-y}
-        REDIS_SLAVEOF_IP: ${REDIS_SLAVEOF_IP:-}
-        REDIS_SLAVEOF_PORT: ${REDIS_SLAVEOF_PORT:-}
-        COMPOSE_PROJECT_NAME: ${COMPOSE_PROJECT_NAME:-mailcow-dockerized}
+      env_file: mailcow.conf
       ports:
         - "${DOVEADM_PORT:-127.0.0.1:19991}:12345"
         - "${IMAP_PORT:-143}:143"
@@ -260,6 +180,7 @@ services:
         - "${POP_PORT:-110}:110"
         - "${POPS_PORT:-995}:995"
         - "${SIEVE_PORT:-4190}:4190"
+      restart: unless-stopped
       tty: true
       labels:
         ofelia.enabled: "true"
@@ -293,7 +214,6 @@ services:
 
     postfix-mailcow:
       image: mailcow/postfix:1.66
-      restart: unless-stopped
       depends_on:
         - mysql-mailcow
       volumes:
@@ -304,21 +224,14 @@ services:
         - crypt-vol-1:/var/lib/zeyple:z
         - rspamd-vol-1:/var/lib/rspamd:z
         - mysql-socket-vol-1:/var/run/mysqld/:z
-      environment:
-        LOG_LINES: ${LOG_LINES:-9999}
-        TZ: ${TZ}
-        DBNAME: ${DBNAME}
-        DBUSER: ${DBUSER}
-        DBPASS: ${DBPASS}
-        REDIS_SLAVEOF_IP: ${REDIS_SLAVEOF_IP:-}
-        REDIS_SLAVEOF_PORT: ${REDIS_SLAVEOF_PORT:-}
-        MAILCOW_HOSTNAME: ${MAILCOW_HOSTNAME}
+      env_file: mailcow.conf
       cap_add:
         - NET_BIND_SERVICE
       ports:
         - "${SMTP_PORT:-25}:25"
         - "${SMTPS_PORT:-465}:465"
         - "${SUBMISSION_PORT:-587}:587"
+      restart: unless-stopped
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       networks:
@@ -330,20 +243,18 @@ services:
     memcached-mailcow:
       image: memcached:alpine
       restart: unless-stopped
-      environment:
-        - TZ=${TZ}
+      env_file: mailcow.conf
       networks:
         mailcow-network:
           aliases:
             - memcached
 
     nginx-mailcow:
-      image: nginx:mainline-alpine
-      restart: unless-stopped
       depends_on:
         - sogo-mailcow
         - php-fpm-mailcow
         - redis-mailcow
+      image: nginx:mainline-alpine
       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 &&
@@ -358,15 +269,7 @@ services:
         until ping redis -c1 > /dev/null; do sleep 1; done &&
         until ping rspamd -c1 > /dev/null; do sleep 1; done &&
         exec nginx -g 'daemon off;'"
-      environment:
-        HTTPS_PORT: ${HTTPS_PORT:-443}
-        HTTP_PORT: ${HTTP_PORT:-80}
-        MAILCOW_HOSTNAME: ${MAILCOW_HOSTNAME}
-        IPV4_NETWORK: ${IPV4_NETWORK:-172.22.1}
-        TZ: ${TZ}
-        SKIP_SOGO: ${SKIP_SOGO:-n}
-        ALLOW_ADMIN_EMAIL_LOGIN: ${ALLOW_ADMIN_EMAIL_LOGIN:-n}
-        ADDITIONAL_SERVER_NAMES: ${ADDITIONAL_SERVER_NAMES:-}
+      env_file: mailcow.conf
       volumes:
         - ./data/web:/web:ro,z
         - ./data/conf/rspamd/dynmaps:/dynmaps:ro,z
@@ -377,15 +280,10 @@ services:
       # ports:
       #   - "${HTTPS_BIND:-:}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
       #   - "${HTTP_BIND:-:}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"
+      restart: unless-stopped
       labels:
-        caddy: mail.marcpartensky.com, mail.marc.wf, mail.marc.tf, m.marc.wf, m.marc.tf
+        caddy: mail.marcpartensky.com
         caddy.reverse_proxy: "{{upstreams 80}}"
-        traefik.enable: true
-        traefik.http.routers.nginx-mailcow.rule: Host(`mail.marcpartensky.com`)
-        traefik.http.routers.nginx-mailcow.entrypoints: websecure
-        traefik.http.routers.nginx-mailcow.tls.certresolver: tls
-        traefik.http.services.nginx-mailcow.loadbalancer.server.port: 80
-
       networks:
         caddy:
         mailcow-network:
@@ -393,38 +291,18 @@ services:
             - nginx
 
     acme-mailcow:
-      image: mailcow/acme:1.81
-      restart: unless-stopped
       depends_on:
         - nginx-mailcow
+      image: mailcow/acme:1.81
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
-      environment:
-        LOG_LINES: ${LOG_LINES:-9999}
-        ACME_CONTACT: ${ACME_CONTACT:-}
-        ADDITIONAL_SAN: ${ADDITIONAL_SAN}
-        MAILCOW_HOSTNAME: ${MAILCOW_HOSTNAME}
-        DBNAME: ${DBNAME}
-        DBUSER: ${DBUSER}
-        DBPASS: ${DBPASS}
-        SKIP_LETS_ENCRYPT: ${SKIP_LETS_ENCRYPT:-n}
-        COMPOSE_PROJECT_NAME: ${COMPOSE_PROJECT_NAME:-mailcow-dockerized}
-        DIRECTORY_URL: ${DIRECTORY_URL:-}
-        ENABLE_SSL_SNI: ${ENABLE_SSL_SNI:-n}
-        SKIP_IP_CHECK: ${SKIP_IP_CHECK:-n}
-        SKIP_HTTP_VERIFICATION: ${SKIP_HTTP_VERIFICATION:-n}
-        ONLY_MAILCOW_HOSTNAME: ${ONLY_MAILCOW_HOSTNAME:-n}
-        LE_STAGING: ${LE_STAGING:-n}
-        TZ: ${TZ}
-        REDIS_SLAVEOF_IP: ${REDIS_SLAVEOF_IP:-}
-        REDIS_SLAVEOF_PORT: ${REDIS_SLAVEOF_PORT:-}
-        SNAT_TO_SOURCE: ${SNAT_TO_SOURCE:-n}
-        SNAT6_TO_SOURCE: ${SNAT6_TO_SOURCE:-n}
+      env_file: mailcow.conf
       volumes:
         - ./data/web/.well-known/acme-challenge:/var/www/acme:z
         - ./data/assets/ssl:/var/lib/acme/:z
         - ./data/assets/ssl-example:/var/lib/ssl-example/:ro,Z
         - mysql-socket-vol-1:/var/run/mysqld/:z
+      restart: unless-stopped
       networks:
         mailcow-network:
           aliases:
@@ -432,7 +310,6 @@ services:
 
     netfilter-mailcow:
       image: mailcow/netfilter:1.46
-      restart: unless-stopped
       stop_grace_period: 30s
       depends_on:
         - dovecot-mailcow
@@ -440,22 +317,15 @@ services:
         - sogo-mailcow
         - php-fpm-mailcow
         - redis-mailcow
+      restart: unless-stopped
       privileged: true
-      environment:
-        TZ: ${TZ}
-        IPV4_NETWORK: ${IPV4_NETWORK:-172.22.1}
-        IPV6_NETWORK: ${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
-        SNAT_TO_SOURCE: ${SNAT_TO_SOURCE:-n}
-        SNAT6_TO_SOURCE: ${SNAT6_TO_SOURCE:-n}
-        REDIS_SLAVEOF_IP: ${REDIS_SLAVEOF_IP:-}
-        REDIS_SLAVEOF_PORT: ${REDIS_SLAVEOF_PORT:-}
+      env_file: mailcow.conf
       network_mode: "host"
       volumes:
         - /lib/modules:/lib/modules:ro
 
     watchdog-mailcow:
       image: mailcow/watchdog:1.96
-      restart: unless-stopped
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       tmpfs:
@@ -465,51 +335,8 @@ services:
         - mysql-socket-vol-1:/var/run/mysqld/:z
         - postfix-vol-1:/var/spool/postfix:z
         - ./data/assets/ssl:/etc/ssl/mail/:ro,z
-      environment:
-        IPV6_NETWORK: ${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
-        LOG_LINES: ${LOG_LINES:-9999}
-        TZ: ${TZ}
-        DBNAME: ${DBNAME}
-        DBUSER: ${DBUSER}
-        DBPASS: ${DBPASS}
-        DBROOT: ${DBROOT}
-        USE_WATCHDOG: ${USE_WATCHDOG:-n}
-        WATCHDOG_NOTIFY_EMAIL: ${WATCHDOG_NOTIFY_EMAIL}
-        WATCHDOG_NOTIFY_BAN: ${WATCHDOG_NOTIFY_BAN:-y}
-        WATCHDOG_SUBJECT: ${WATCHDOG_SUBJECT:-Watchdog ALERT}
-        WATCHDOG_EXTERNAL_CHECKS: ${WATCHDOG_EXTERNAL_CHECKS:-n}
-        WATCHDOG_MYSQL_REPLICATION_CHECKS: ${WATCHDOG_MYSQL_REPLICATION_CHECKS:-n}
-        WATCHDOG_VERBOSE: ${WATCHDOG_VERBOSE:-n}
-        MAILCOW_HOSTNAME: ${MAILCOW_HOSTNAME}
-        COMPOSE_PROJECT_NAME: ${COMPOSE_PROJECT_NAME:-mailcow-dockerized}
-        IPV4_NETWORK: ${IPV4_NETWORK:-172.22.1}
-        IP_BY_DOCKER_API: ${IP_BY_DOCKER_API:-0}
-        CHECK_UNBOUND: ${CHECK_UNBOUND:-1}
-        SKIP_CLAMD: ${SKIP_CLAMD:-n}
-        SKIP_LETS_ENCRYPT: ${SKIP_LETS_ENCRYPT:-n}
-        SKIP_SOGO: ${SKIP_SOGO:-n}
-        HTTPS_PORT: ${HTTPS_PORT:-443}
-        REDIS_SLAVEOF_IP: ${REDIS_SLAVEOF_IP:-}
-        REDIS_SLAVEOF_PORT: ${REDIS_SLAVEOF_PORT:-}
-        EXTERNAL_CHECKS_THRESHOLD: ${EXTERNAL_CHECKS_THRESHOLD:-1}
-        NGINX_THRESHOLD: ${NGINX_THRESHOLD:-5}
-        UNBOUND_THRESHOLD: ${UNBOUND_THRESHOLD:-5}
-        REDIS_THRESHOLD: ${REDIS_THRESHOLD:-5}
-        MYSQL_THRESHOLD: ${MYSQL_THRESHOLD:-5}
-        MYSQL_REPLICATION_THRESHOLD: ${MYSQL_REPLICATION_THRESHOLD:-1}
-        SOGO_THRESHOLD: ${SOGO_THRESHOLD:-3}
-        POSTFIX_THRESHOLD: ${POSTFIX_THRESHOLD:-8}
-        CLAMD_THRESHOLD: ${CLAMD_THRESHOLD:-15}
-        DOVECOT_THRESHOLD: ${DOVECOT_THRESHOLD:-12}
-        DOVECOT_REPL_THRESHOLD: ${DOVECOT_REPL_THRESHOLD:-20}
-        PHPFPM_THRESHOLD: ${PHPFPM_THRESHOLD:-5}
-        RATELIMIT_THRESHOLD: ${RATELIMIT_THRESHOLD:-1}
-        FAIL2BAN_THRESHOLD: ${FAIL2BAN_THRESHOLD:-1}
-        ACME_THRESHOLD: ${ACME_THRESHOLD:-1}
-        RSPAMD_THRESHOLD: ${RSPAMD_THRESHOLD:-5}
-        OLEFY_THRESHOLD: ${OLEFY_THRESHOLD:-5}
-        MAILQ_THRESHOLD: ${MAILQ_THRESHOLD:-20}
-        ILQ_CRIT: ${MAILQ_CRIT:-30}
+      restart: unless-stopped
+      env_file: mailcow.conf
       networks:
         mailcow-network:
           aliases:
@@ -517,15 +344,13 @@ services:
 
     dockerapi-mailcow:
       image: mailcow/dockerapi:1.41
-      restart: unless-stopped
       security_opt:
         - label=disable
+      restart: unless-stopped
         # oom_kill_disable: true
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
-      environment:
-        DBROOT: ${DBROOT}
-        TZ: ${TZ}
+      env_file: mailcow.conf
       volumes:
         - /var/run/docker.sock:/var/run/docker.sock:ro
       networks:
@@ -540,10 +365,7 @@ services:
         - solr-vol-1:/opt/solr/server/solr/dovecot-fts/data:Z
       ports:
         - "${SOLR_PORT:-127.0.0.1:18983}:8983"
-      environment:
-        TZ: ${TZ}
-        SOLR_HEAP: ${SOLR_HEAP:-1024}
-        SKIP_SOLR: ${SKIP_SOLR:-y}
+      env_file: mailcow.conf
       networks:
         mailcow-network:
           aliases:
@@ -552,16 +374,7 @@ services:
     olefy-mailcow:
       image: mailcow/olefy:1.8.1
       restart: unless-stopped
-      environment:
-        TZ: ${TZ}
-        OLEFY_BINDADDRESS: 0.0.0.0
-        OLEFY_BINDPORT: 10055
-        OLEFY_TMPDIR: /tmp
-        OLEFY_PYTHON_PATH: /usr/bin/python3
-        OLEFY_OLEVBA_PATH: /usr/bin/olevba3
-        OLEFY_LOGLVL: 20
-        OLEFY_MINLENGTH: 500
-        OLEFY_DEL_TMP: 1
+      env_file: mailcow.conf
       networks:
         mailcow-network:
           aliases:
@@ -571,8 +384,7 @@ services:
       image: mcuadros/ofelia:latest
       restart: unless-stopped
       command: daemon --docker
-      environment:
-        - TZ=${TZ}
+      env_file: mailcow.conf
       depends_on:
         - sogo-mailcow
         - dovecot-mailcow
@@ -587,35 +399,34 @@ services:
           aliases:
             - ofelia
 
-    # ipv6nat-mailcow:
-    #   image: robbertkl/ipv6nat
-    #   restart: unless-stopped
-    #   depends_on:
-    #     - unbound-mailcow
-    #     - mysql-mailcow
-    #     - redis-mailcow
-    #     - clamd-mailcow
-    #     - rspamd-mailcow
-    #     - php-fpm-mailcow
-    #     - sogo-mailcow
-    #     - dovecot-mailcow
-    #     - postfix-mailcow
-    #     - memcached-mailcow
-    #     - nginx-mailcow
-    #     - acme-mailcow
-    #     - netfilter-mailcow
-    #     - watchdog-mailcow
-    #     - dockerapi-mailcow
-    #     - solr-mailcow
-    #   environment:
-    #     - TZ=${TZ}
-    #   security_opt:
-    #     - label=disable
-    #   privileged: true
-    #   network_mode: "host"
-    #   volumes:
-    #     - /var/run/docker.sock:/var/run/docker.sock:ro
-    #     - /lib/modules:/lib/modules:ro
+    ipv6nat-mailcow:
+      depends_on:
+        - unbound-mailcow
+        - mysql-mailcow
+        - redis-mailcow
+        - clamd-mailcow
+        - rspamd-mailcow
+        - php-fpm-mailcow
+        - sogo-mailcow
+        - dovecot-mailcow
+        - postfix-mailcow
+        - memcached-mailcow
+        - nginx-mailcow
+        - acme-mailcow
+        - netfilter-mailcow
+        - watchdog-mailcow
+        - dockerapi-mailcow
+        - solr-mailcow
+      env_file: mailcow.conf
+      image: robbertkl/ipv6nat
+      security_opt:
+        - label=disable
+      restart: unless-stopped
+      privileged: true
+      network_mode: "host"
+      volumes:
+        - /var/run/docker.sock:/var/run/docker.sock:ro
+        - /lib/modules:/lib/modules:ro
 
 networks:
   mailcow-network:

run.sh

@@ -1 +0,0 @@
-export $(grep -v '^#' .env | xargs -0)