diff --git a/postfix/defaults/main.yml b/postfix/defaults/main.yml index 3c1adc3d4abd2be75b60b8d69a61a57f29f645af..1f89644c138ebe8c8ebcb76e2a9ef63141314368 100644 --- a/postfix/defaults/main.yml +++ b/postfix/defaults/main.yml @@ -34,6 +34,7 @@ postfix_network_access: postfix_content_filter: false # or: spamassassin postfix_message_size_limit: 10240000 # 10M +postfix_aliases_rt_url: '' postfix_aliases_rt: [] # - queue: IT # url: https://rt.example.com diff --git a/postfix/templates/aliases.j2 b/postfix/templates/aliases.j2 index 1604e7c47ae81a55c295c82ef8db2577d1bf9ed9..b52c679fcafda1f0db9d7bb41d72469b42bd1d5f 100644 --- a/postfix/templates/aliases.j2 +++ b/postfix/templates/aliases.j2 @@ -1,7 +1,14 @@ {% for alias in system_aliases %} -{{ alias.src }}: {{ alias.dest }} +{% if alias.src is string %} +{{ alias.src }}: {{ alias.dest if alias.dest is string else alias.dest|join(', ') }} +{% else %} +{% for src in alias.src %} +{{ src }}: {{ alias.dest if alias.dest is string else alias.dest|join(', ') }} {% endfor %} +{% endif %} +{% endfor %} + {% for alias in postfix_aliases_rt|default([]) %} -{{ alias.address|default(alias.queue|lower) }}: "|/usr/bin/rt-mailgate --queue {{ alias.queue }} --action correspond --url {{ alias.url }}" -{{ alias.address|default(alias.queue|lower) }}-comment: "|/usr/bin/rt-mailgate --queue {{ alias.queue }} --action comment --url {{ alias.url }}" +{{ alias.address|default(alias.queue|lower) }}: "|/usr/bin/rt-mailgate --queue {{ alias.queue }} --action correspond --url {{ alias.url|default(postfix_aliases_rt_url) }}" +{{ alias.address|default(alias.queue|lower) }}-comment: "|/usr/bin/rt-mailgate --queue {{ alias.queue }} --action comment --url {{ alias.url|default(postfix_aliases_rt_url) }}" {% endfor %} diff --git a/postfix/templates/virtual.j2 b/postfix/templates/virtual.j2 index ac13c8d3bf8f2f6227a9facadc323779b642f573..5f6230ec30f082f6702ea26634be0c6696eb0c5a 100644 --- a/postfix/templates/virtual.j2 +++ b/postfix/templates/virtual.j2 @@ -6,7 +6,7 @@ abuse@{{ domain }} {{ adminaddr }} {% for alias in virtual_aliases %} {% if alias.src is string %} -{{ alias.src }} {{ alias.dest }} +{{ alias.src }} {{ alias.dest if alias.dest is string else alias.dest|join(', ') }} {% else %} {% for src in alias.src %} {{ src }}@{{ alias.domain }} {{ alias.dest if alias.dest is string else alias.dest|join(', ') }}