From 1fb7cd00b40f720c6d2dde55328401c623b593d3 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Mon, 26 Apr 2021 00:10:22 +0200
Subject: [PATCH] postfix: don't differentiate between undefined and empty
alias lists
---
postfix/tasks/main.yml | 2 +-
postfix/templates/aliases.j2 | 2 +-
postfix/templates/main.cf.j2 | 2 +-
postfix/templates/virtual.j2 | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/postfix/tasks/main.yml b/postfix/tasks/main.yml
index 481ad35..53527ce 100644
--- a/postfix/tasks/main.yml
+++ b/postfix/tasks/main.yml
@@ -130,7 +130,7 @@
template:
src: virtual.j2
dest: /etc/postfix/virtual
- when: virtual_aliases is defined or postfix_virtual_domains|count > 0
+ when: virtual_aliases|default([])|count > 0 or postfix_virtual_domains|count > 0
notify:
- postmap virtual
tags:
diff --git a/postfix/templates/aliases.j2 b/postfix/templates/aliases.j2
index b52c679..ea3de67 100644
--- a/postfix/templates/aliases.j2
+++ b/postfix/templates/aliases.j2
@@ -1,4 +1,4 @@
-{% for alias in system_aliases %}
+{% for alias in system_aliases|default([]) %}
{% if alias.src is string %}
{{ alias.src }}: {{ alias.dest if alias.dest is string else alias.dest|join(', ') }}
{% else %}
diff --git a/postfix/templates/main.cf.j2 b/postfix/templates/main.cf.j2
index 988b60a..e07ad80 100644
--- a/postfix/templates/main.cf.j2
+++ b/postfix/templates/main.cf.j2
@@ -98,7 +98,7 @@ tls_ssl_options = NO_COMPRESSION
alias_maps = cdb:/etc/aliases
alias_database = cdb:/etc/aliases
-{% if virtual_aliases is defined or postfix_virtual_domains|count > 0 %}
+{% if virtual_aliases|default([])|count > 0 or postfix_virtual_domains|count > 0 %}
virtual_alias_maps = cdb:/etc/postfix/virtual
{% endif %}
diff --git a/postfix/templates/virtual.j2 b/postfix/templates/virtual.j2
index 5f6230e..99d4e92 100644
--- a/postfix/templates/virtual.j2
+++ b/postfix/templates/virtual.j2
@@ -4,7 +4,7 @@ hostmaster@{{ domain }} {{ adminaddr }}
abuse@{{ domain }} {{ adminaddr }}
{% endfor %}
-{% for alias in virtual_aliases %}
+{% for alias in virtual_aliases|default([]) %}
{% if alias.src is string %}
{{ alias.src }} {{ alias.dest if alias.dest is string else alias.dest|join(', ') }}
{% else %}
--
GitLab