Files
@ ceb51ff23ae3
Branch filter:
Location: majic-ansible-roles/roles/mail_forwarder/templates/ferm_mail.conf.j2 - annotation
ceb51ff23ae3
717 B
text/plain
MAR-132: Added support to xmpp_server role for Debian 9 (Stretch):
- Updated tests to include Debian 9 in testing. Existing private keys
are reused where possible (since most of the naming is identical
between the machines with jessie/stretch).
- Updated invocation of sendxmpp in tests as workaround for
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854210.
- Updated testing of imported keys to accomodate differences between
gpg/gpg2 (used by apt-key in Jessie/Stretch).
- Updated tests to include Debian 9 in testing. Existing private keys
are reused where possible (since most of the naming is identical
between the machines with jessie/stretch).
- Updated invocation of sendxmpp in tests as workaround for
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854210.
- Updated testing of imported keys to accomodate differences between
gpg/gpg2 (used by apt-key in Jessie/Stretch).
d92577936630 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 13fd27e4004c 13fd27e4004c 13fd27e4004c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 7df70ebc439c 13fd27e4004c | {% if smtp_relay_host and smtp_from_relay_allowed %}
domain ip {
# Accept incoming connections on port 25 from SMTP relay host.
table filter {
chain INPUT {
# SMTP for server communication.
proto tcp dport 25 {
saddr {{ smtp_relay_host }} ACCEPT;
}
}
}
}
{% if lookup('dig', smtp_relay_host + '/AAAA') not in ['NXDOMAIN', ''] %}
domain ip6 {
# Accept incoming connections on port 25 from SMTP relay host.
table filter {
chain INPUT {
# SMTP for server communication.
proto tcp dport 25 {
saddr {{ smtp_relay_host }} ACCEPT;
}
}
}
}
{% endif %}
{% endif %}
|