diff --git a/config/roundcube/Dockerfile b/config/roundcube/Dockerfile index 8bb5d30..68714a1 100644 --- a/config/roundcube/Dockerfile +++ b/config/roundcube/Dockerfile @@ -1,7 +1,8 @@ FROM roundcube/roundcubemail:latest-apache +COPY docker-override.inc.php /var/www/html/config/docker-override.inc.php +COPY managesieve.config.inc.php /managesieve.config.inc.php COPY entrypoint.sh /entrypoint-custom.sh -COPY docker-override.inc.php /docker-override.inc.php RUN chmod +x /entrypoint-custom.sh diff --git a/config/roundcube/entrypoint.sh b/config/roundcube/entrypoint.sh index e4a52e0..5dde904 100644 --- a/config/roundcube/entrypoint.sh +++ b/config/roundcube/entrypoint.sh @@ -14,4 +14,14 @@ done grep -q "docker-override" /var/www/html/config/config.inc.php || \ echo "require_once '/var/www/html/config/docker-override.inc.php';" >> /var/www/html/config/config.inc.php +# Настройка managesieve +cat > /var/www/html/plugins/managesieve/config.inc.php << 'PHPEOF' + [ + 'verify_peer' => false, + 'verify_peer_name' => false, + ], +]; diff --git a/config/stalwart/config.json b/config/stalwart/config.json new file mode 100644 index 0000000..56f3858 --- /dev/null +++ b/config/stalwart/config.json @@ -0,0 +1,4 @@ +{ + "@type": "RocksDb", + "path": "/opt/stalwart" +} diff --git a/docker-compose.yml.template b/docker-compose.yml.template index 9890265..3f4cbc7 100644 --- a/docker-compose.yml.template +++ b/docker-compose.yml.template @@ -16,6 +16,9 @@ services: - "443:443" # HTTPS (если не используется внешний reverse proxy) volumes: - ./data/stalwart:/opt/stalwart + - ./config/stalwart:/etc/stalwart + #- STALWART_RECOVERY_ADMIN=admin:MyStrongPassword123 + #- STALWART_RECOVERY_MODE=1 environment: - TZ=${TZ:-UTC} depends_on: @@ -88,6 +91,31 @@ services: networks: - mail + autoheal: + image: willfarrell/autoheal:latest + container_name: autoheal + restart: unless-stopped + environment: + - AUTOHEAL_CONTAINER_LABEL=all + volumes: + - /var/run/docker.sock:/var/run/docker.sock + + cadvisor: + image: gcr.io/cadvisor/cadvisor:latest + container_name: cadvisor + restart: unless-stopped + ports: + - "8091:8080" + volumes: + - /:/rootfs:ro + - /var/run:/var/run:ro + - /sys:/sys:ro + - /var/lib/docker/:/var/lib/docker:ro + - /dev/disk/:/dev/disk:ro + privileged: true + networks: + - mail + networks: mail: name: mail