From 902b16e8943144fd84f8780a46948fc15911ac2c Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Wed, 10 Jan 2024 11:53:56 +0100
Subject: [PATCH] composer/plugin/docker4drupal#64 Add support for mailpit
---
src/Handler.php | 2 +-
templates/docker-compose.yml.twig | 1 -
templates/mailpitout.yml.twig | 2 +-
templates/settings.docker.php.twig | 6 +++---
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/Handler.php b/src/Handler.php
index 3092d40..7ab602e 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -143,7 +143,7 @@ class Handler extends BaseHandler {
'allowinsecure' => $this->env->receiveGlobal('MAILPIT_ALLOW_INSECURE', 'MailPit allow insecure'),
'auth' => $this->env->receiveGlobal('MAILPIT_AUTH', 'MailPit Auth (none|plain|login|cram-md5)'),
'secret' => $this->env->receiveGlobal('MAILPIT_SECRET', 'MailPit Secret'),
- 'returnpath' => $this->env->receiveGlobal('MAILPIT_RETURNPATH', 'MailPit Bound Address'),
+ 'returnpath' => $this->env->receiveGlobal('MAILPIT_RETURNPATH', 'MailPit Bounce Address'),
'recipientallowlist' => $this->env->receiveGlobal('MAILPIT_RECIPIENT_ALLOW_LIST', 'MailPit Regex for allowed recipients'),
],
'varnish' => [
diff --git a/templates/docker-compose.yml.twig b/templates/docker-compose.yml.twig
index dc267a7..2da676a 100644
--- a/templates/docker-compose.yml.twig
+++ b/templates/docker-compose.yml.twig
@@ -323,7 +323,6 @@ services:
traefik.http.routers.mailhog-{{ projectname }}.tls: 'true'
traefik.http.routers.mailhog-{{ projectname }}.tls.certresolver: lakedrops
{% endif %}
-{% endif %}
{% elseif mailpit.enable and (not drupal.live|default(0) or staging) %}
mailpit:
diff --git a/templates/mailpitout.yml.twig b/templates/mailpitout.yml.twig
index 1c111b8..4fa8b29 100644
--- a/templates/mailpitout.yml.twig
+++ b/templates/mailpitout.yml.twig
@@ -1,6 +1,6 @@
host: '{{ mailpit.host }}'
{% if mailpit.port != '' %}
-port: '{{ mailpit.port }}'
+port: {{ mailpit.port }}
{% endif %}
{% if mailpit.username != '' %}
username: '{{ mailpit.username }}'
diff --git a/templates/settings.docker.php.twig b/templates/settings.docker.php.twig
index 3cb6b49..709248a 100644
--- a/templates/settings.docker.php.twig
+++ b/templates/settings.docker.php.twig
@@ -33,10 +33,10 @@ $databases = array(
),
),
);
-{% if not drupal.live|default(0) or mailhog.enable %}
+{% if not drupal.live|default(0) or mailhog.enable or mailpit.enable %}
$config['system.mail']['interface']['default'] = 'SMTPMailSystem';
$config['smtp.settings']['smtp_on'] = TRUE;
-$config['smtp.settings']['smtp_host'] = 'mailhog';
+$config['smtp.settings']['smtp_host'] = '{% if mailhog.enable %}mailhog{% else %}mailpit{% endif %}';
$config['smtp.settings']['smtp_hostbackup'] = '';
$config['smtp.settings']['smtp_port'] = '1025';
$config['smtp.settings']['smtp_protocol'] = 'standard';
@@ -65,7 +65,7 @@ $databases = array(
);
$base_url = '{{ projectprotocol }}://{{ projectdomain }}{{ projectport }}';
-$conf['smtp_host'] = 'mailhog';
+$conf['smtp_host'] = '{% if mailhog.enable %}mailhog{% else %}mailpit{% endif %}';
$conf['smtp_hostbackup'] = '';
$conf['smtp_port'] = '1025';
$conf['smtp_protocol'] = 'standard';
--
GitLab