From 2b4d73790fe9853f9d0cce3e95b470c26a4dec77 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Sat, 6 Jan 2024 19:52:49 +0100
Subject: [PATCH] Make sender domain handling even smarter

---
 .ansible-lint                                     | 1 +
 roles/apps/defaults/main.yml                      | 3 +--
 roles/apps/templates/compose-files/postfix.yml.j2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index 76828b2..0fbb524 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -65,6 +65,7 @@ warn_list:
   - latest[git]
   - package-latest
   - var-naming[no-role-prefix]
+  - yaml[line-length]
   # - role-name
   # - yaml[document-start]  # you can also use sub-rule matches
 
diff --git a/roles/apps/defaults/main.yml b/roles/apps/defaults/main.yml
index f6420c6..762642c 100644
--- a/roles/apps/defaults/main.yml
+++ b/roles/apps/defaults/main.yml
@@ -65,5 +65,4 @@ apps_vars:
 apps_include: "{{ apps_vars | dict2items | map(attribute='key') | list }}"
 apps_backup: "{{ apps_vars | dict2items | selectattr('value.backup', 'true') | map(attribute='key') | list | intersect(apps_include) }}"
 apps_proxied: "{{ apps_vars | dict2items | selectattr('value.domain', 'defined') | map(attribute='key') | list | intersect(apps_include) }}"
-apps_senders: "{{ apps_vars | dict2items | selectattr('value.sender', 'true') | map(attribute='key') | list | intersect(apps_include) }}"
-apps_sender_domains: "{{ apps_vars | dict2items | selectattr('key', 'in', apps_senders) | map(attribute='value.domain') | list }}"
+apps_senders: "{{ apps_vars | dict2items | selectattr('value.sender', 'true') | selectattr('key', 'in', apps_include) | map(attribute='value.domain') | list }}"
diff --git a/roles/apps/templates/compose-files/postfix.yml.j2 b/roles/apps/templates/compose-files/postfix.yml.j2
index 0f5c019..7cb8740 100644
--- a/roles/apps/templates/compose-files/postfix.yml.j2
+++ b/roles/apps/templates/compose-files/postfix.yml.j2
@@ -8,7 +8,7 @@ services:
     image: boky/postfix:{{ apps_vars.postfix.version }}
     restart: always
     environment:
-      ALLOWED_SENDER_DOMAINS: {{ apps_sender_domains | join(' ') }}
+      ALLOWED_SENDER_DOMAINS: {{ apps_senders | join(' ') }}
       HOSTNAME: {{ apps_vars.postfix.hostname }}
       DKIM_AUTOGENERATE: true
     networks: