From e34fced02578c2f4aecebd2102bd9ed5697c2d14 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 14 Aug 2020 11:59:39 +0200 Subject: [PATCH 1/2] Uncomment the parameter that set the limits on the scanned email size. --- templates/spamassassin-local.cf.j2 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/spamassassin-local.cf.j2 b/templates/spamassassin-local.cf.j2 index 388c72b..ac66f30 100644 --- a/templates/spamassassin-local.cf.j2 +++ b/templates/spamassassin-local.cf.j2 @@ -35,19 +35,20 @@ use_pyzor 0 # them to UTF-8 before the text is given over to rules processing. # normalize_charset {{ spamassassin_normalize_charset }} +# # Amount of data per email text/* mimepart, that will be run through body # rules. This enables safer and faster scanning of large messages, # perhaps having very large textual attachments. There should be no need # to change this well tested default. # -#body_part_scan_size {{ spamassassin_text_body_scan_size }} - +body_part_scan_size {{ spamassassin_text_body_scan_size }} +# # Textual rawbody data scan limit (default: 500000) # # Amount of data per email text/* mimepart, that will be run through # rawbody rules. # -#rawbody_part_scan_size {{ spamassassin_body_part_scan_size }} +rawbody_part_scan_size {{ spamassassin_body_part_scan_size }} {% if spamassassin_shortcircuit_plugin %} loadplugin Mail::SpamAssassin::Plugin::Shortcircuit @@ -63,4 +64,4 @@ shortcircuit {{ rule.key }} {{ rule.value }} {% for rule in spamassassin_local_rules %} {{ rule }} -{% endfor %} \ No newline at end of file +{% endfor %} -- 2.17.1 From 25e5032368ece8e34036e66e3ec5f0a9373bd100 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 14 Aug 2020 12:10:20 +0200 Subject: [PATCH 2/2] Add some tags to the spamass-milter tasks. --- tasks/spamass-milter.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tasks/spamass-milter.yml b/tasks/spamass-milter.yml index 010f3ae..424cb8c 100644 --- a/tasks/spamass-milter.yml +++ b/tasks/spamass-milter.yml @@ -12,16 +12,17 @@ - name: Install the spamassassin milter startup options template: src=spamass-milter_sysconfig.j2 dest=/etc/sysconfig/spamass-milter owner=root group=root mode=0444 notify: Restart spamass-milter + tags: [ 'spamassassin', 'spamassassin_conf', 'spamassassin_service', 'spamass_milter', 'spamass_milter_conf' ] - - name: Ensure that the spamassassin service is started and enabled + - name: Ensure that the spamass-milter service is started and enabled service: name=spamass-milter state=started enabled=yes - tags: [ 'spamassassin', 'spamassassin_conf', 'spamassassin_service' ] + tags: [ 'spamassassin', 'spamassassin_conf', 'spamassassin_service', 'spamass_milter' ] - name: Manage the spamassassin service block: - - name: Shut down the spamassassin service if it is meant to be remote + - name: Shut down the spamassassin service when we connect to a remote service service: name=spamassassin state=stopped enabled=no when: not spamassassin_install | bool - tags: [ 'spamassassin', 'spamassassin_conf', 'spamassassin_service' ] + tags: [ 'spamassassin', 'spamassassin_conf', 'spamassassin_service', 'spamass_milter' ] -- 2.17.1