Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
infra
ansible-shared
communication
Commits
28987fab
Commit
28987fab
authored
Jun 17, 2019
by
Lars Beckers
Browse files
Merge branch 'ext-1' into 'master'
New flexible configuration features for postfix See merge request
!2
parents
89ffd71b
f5e172d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
postfix/templates/postscreen_access.cidr.j2
View file @
28987fab
...
...
@@ -12,5 +12,22 @@
#
{% for net in postfix_network_access %}
{% if 'comment' in net %}
{{ net.comment|comment('plain', prefix='', postfix='') }}
{% endif %}
{% if 'cidr' in net %}
{{ net.cidr }} {{ net.action|default('dunno') }}
{% endif %}
{% if 'mx' in net %}
{{ net.mx|comment('plain', prefix='', postfix='') }}
{% for mx in q('dig', net.mx, 'qtype=MX') %}
{% for addr in q('dig', mx.split(' ', maxsplit=1)[-1], 'qtype=A') %}
{{ addr }} {{ net.action|default('dunno') }}
{% endfor %}
{% for addr in q('dig', mx.split(' ', maxsplit=1)[-1], 'qtype=AAAA') %}
{{ addr }} {{ net.action|default('dunno') }}
{% endfor %}
{% endfor %}
{% endif %}
{% endfor %}
postfix/templates/virtual.j2
View file @
28987fab
...
...
@@ -9,7 +9,7 @@ abuse@{{ domain }} {{ adminaddr }}
{{ alias.src }} {{ alias.dest }}
{% else %}
{% for src in alias.src %}
{{ src }}@{{ alias.domain }} {{ alias.dest }}
{{ src }}@{{ alias.domain }} {{ alias.dest
if alias.dest is string else alias.dest|join(', ')
}}
{% endfor %}
{% endif %}
{% endfor %}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment