Merge branch 'develop' into 'main'

Merging develop into main

See merge request !104

src/Handler.php

@@ -379,6 +379,7 @@ class Handler extends BaseHandler {
           'projectrootfiles' => $root . '/files',
           'projectrootredis' => $root . '/redis',
           'projectrootinvoiceninja' => $root . '/in',
+          'projectrootmailpit' => $root . '/mailpit',
           'projectname' => 'drupal_' . getenv('PROJECT_NAME') . '_' . getenv('CI_COMMIT_REF_SLUG'),
           'projectdomain' => str_replace('_', '-', $this->config->readValue('domain') ?? ''),
           'projectprotocol' => 'https',

templates/docker-compose.yml.twig

@@ -305,14 +305,14 @@ services:
       - traefik-public
       - default
     environment:
-      MP_SMTP_RELAY_CONFIG: /data/mailpitout.yml
+      MP_SMTP_RELAY_CONFIG: /config/mailpitout.yml
       MP_DATA_FILE: /data/mailpit.db
     privileged: true
     volumes:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-      - {{ projectrootmailpit }}/mailpitout.yml:/data/mailpitout.yml
       - {{ projectrootmailpit }}:/data
+      - {{ projectroot }}/mailpit/mailpitout.yml:/config/mailpitout.yml
 {% if mailpit.routed %}
     labels:
       traefik.enable: 'true'