Skip to content
Snippets Groups Projects
Commit 902b16e8 authored by jurgenhaas's avatar jurgenhaas
Browse files

#64 Add support for mailpit

parent ef9b877d
No related branches found
Tags v3.6.3
1 merge request!79Merging develop into main
Pipeline #1134044 passed
......@@ -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' => [
......
......@@ -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:
......
host: '{{ mailpit.host }}'
{% if mailpit.port != '' %}
port: '{{ mailpit.port }}'
port: {{ mailpit.port }}
{% endif %}
{% if mailpit.username != '' %}
username: '{{ mailpit.username }}'
......
......@@ -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';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment