adellam
/
ansible-role-spamassassin
forked from ISTI-ansible-roles/ansible-role-spamassassin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add the --headers and -z options to spamc.

This commit is contained in:
Andrea Dell'Amico 2020-07-13 01:22:20 +02:00
parent 2510a0e156
commit 259e4154b3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -109,4 +109,5 @@ spamassassin_milter_change_headers: True
spamassassin_milter_ssl_enabled: '{{ spamassassin_spamd_ssl_enabled }}'
# In bytes
spamassassin_milter_spamc_max_msg_size: '512000'
spamassassin_milter_enable_compression: False

2
templates/spamass-milter_sysconfig.j2
View File

@ -5,4 +5,4 @@
### spamass-milter-root.service instead of spamass-milter.service if you
### wish to do this but otherwise it's best to run as the unprivileged user
### sa-milt by using the normal spamass-milter.service
EXTRA_FLAGS="{% if not spamassassin_milter_change_headers %}-m {% endif %}{% if spamassassin_milter_set_pref_dom_and_user %}-e {{ spamassassin_milter_pref_default_domain }} -u {{ spamassassin_milter_pref_default_user }}{% endif %} -r {{ spamassassin_milter_reject_limit }} -C {{ spamassassin_milter_reject_code }} -R '{{ spamassassin_milter_reject_message }}' {% if spamassassin_milter_exclude_whitelisted_networks %}-i {{ spamassassin_milter_whitelisted_networks }}{% endif %} {% if spamassassin_milter_connect_to_external_spamd %}-- -d {{ spamassassin_milter_external_spamd_hosts }} -p {{ spamassassin_milter_external_spamd_port }}{% if spamassassin_milter_external_round_robin_hosts %} -H{% endif %}{%if spamassassin_milter_ssl_enabled %} -S{% endif %}{% endif %} -s {{ spamassassin_milter_spamc_max_msg_size }}"
EXTRA_FLAGS="{% if not spamassassin_milter_change_headers %}-m {% endif %}{% if spamassassin_milter_set_pref_dom_and_user %}-e {{ spamassassin_milter_pref_default_domain }} -u {{ spamassassin_milter_pref_default_user }}{% endif %} -r {{ spamassassin_milter_reject_limit }} -C {{ spamassassin_milter_reject_code }} -R '{{ spamassassin_milter_reject_message }}' {% if spamassassin_milter_exclude_whitelisted_networks %}-i {{ spamassassin_milter_whitelisted_networks }}{% endif %} {% if spamassassin_milter_connect_to_external_spamd %}-- -d {{ spamassassin_milter_external_spamd_hosts }} -p {{ spamassassin_milter_external_spamd_port }}{% if spamassassin_milter_external_round_robin_hosts %} -H{% endif %}{%if spamassassin_milter_ssl_enabled %} -S{% endif %}{% endif %} -s {{ spamassassin_milter_spamc_max_msg_size }}{%if spamassassin_report_safe == '0' %} --headers{% endif %}{% if spamassassin_milter_enable_compression %} -z{% endif %}"