From 99e2d0482931e497fe6720869027a09b400972ed Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Thu, 5 Jan 2023 16:10:44 +0100
Subject: [PATCH] Set up DKIM for Postfix

---
 roles/docker/defaults/main.yml          |  1 +
 roles/docker/tasks/services/postfix.yml | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index bc88a267..f43f9a35 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -8,6 +8,7 @@ services:
   postfix:
     file: postfix.yml
     domain: "smtp.{{ base_domain }}"
+    volume_folder: "{{ volume_root_folder }}/postfix"
     version: "v3.5.1-alpine"
 
   nginx_proxy:
diff --git a/roles/docker/tasks/services/postfix.yml b/roles/docker/tasks/services/postfix.yml
index f44da25a..ece525e3 100644
--- a/roles/docker/tasks/services/postfix.yml
+++ b/roles/docker/tasks/services/postfix.yml
@@ -1,20 +1,28 @@
 # vim: ft=yaml.ansible
 ---
-- name: setup network for postfix
+- name: Set up network for postfix
   docker_network:
     name: postfix
     ipam_config:
       - subnet: '172.16.0.0/16'
         gateway: 172.16.0.1
 
-- name: setup postfix docker container for outgoing mail
+- name: Create volume folders for Postfix
+  file:
+    name: "{{ services.postfix.volume_folder }}/dkim"
+    state: directory
+
+- name: Set up Postfix Docker container for outgoing mail from services
   docker_container:
     name: postfix
     image: boky/postfix:{{ services.postfix.version }}
     restart_policy: always
     networks:
       - name: postfix
+    volumes:
+      - "{{ services.postfix.volume_folder }}/dkim:/etc/opendkim/keys"
     env:
       # Get all services which have allowed_sender_domain defined
       ALLOWED_SENDER_DOMAINS: "{{ services | dict2items | selectattr('value.allowed_sender_domain', 'true') | map(attribute='value.domain') | join(' ') }}"
       HOSTNAME: "{{ services.postfix.domain }}" # the name the smtp server will identify itself as
+      DKIM_AUTOGENERATE: "true"