Files
@ 74b1cab547fc
Branch filter:
Location: majic-ansible-roles/roles/mail_forwarder/templates/ferm_mail.conf.j2 - annotation
74b1cab547fc
717 B
text/plain
MAR-122: Fixed handling of complex package versions for pip with Ansible 2.x:
- Use list for installing specific version of pip in the "pipreqcheck" virtual
environment in common role.
- Removed superficious (and incorrect) definition for application admin username
in wsgi_website role.
- Updated test playbook for wsgi_website role to test the fix.
- Switched to passing-in package list for installing packages in virtual
environment instead of using "with_items" in wsgi_website role.
- Use list for installing specific version of pip in the "pipreqcheck" virtual
environment in common role.
- Removed superficious (and incorrect) definition for application admin username
in wsgi_website role.
- Updated test playbook for wsgi_website role to test the fix.
- Switched to passing-in package list for installing packages in virtual
environment instead of using "with_items" in wsgi_website role.
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 %}
|