master #15

Merged
adellam merged 2 commits from adellam/ansible-role-spamassassin:master into master 2020-08-14 12:10:55 +02:00
2 changed files with 10 additions and 8 deletions

View File

@ -12,16 +12,17 @@
- name: Install the spamassassin milter startup options - name: Install the spamassassin milter startup options
template: src=spamass-milter_sysconfig.j2 dest=/etc/sysconfig/spamass-milter owner=root group=root mode=0444 template: src=spamass-milter_sysconfig.j2 dest=/etc/sysconfig/spamass-milter owner=root group=root mode=0444
notify: Restart spamass-milter 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 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 - name: Manage the spamassassin service
block: 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 service: name=spamassassin state=stopped enabled=no
when: not spamassassin_install | bool when: not spamassassin_install | bool
tags: [ 'spamassassin', 'spamassassin_conf', 'spamassassin_service' ] tags: [ 'spamassassin', 'spamassassin_conf', 'spamassassin_service', 'spamass_milter' ]

View File

@ -35,19 +35,20 @@ use_pyzor 0
# them to UTF-8 before the text is given over to rules processing. # them to UTF-8 before the text is given over to rules processing.
# #
normalize_charset {{ spamassassin_normalize_charset }} normalize_charset {{ spamassassin_normalize_charset }}
#
# Amount of data per email text/* mimepart, that will be run through body # Amount of data per email text/* mimepart, that will be run through body
# rules. This enables safer and faster scanning of large messages, # rules. This enables safer and faster scanning of large messages,
# perhaps having very large textual attachments. There should be no need # perhaps having very large textual attachments. There should be no need
# to change this well tested default. # 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) # Textual rawbody data scan limit (default: 500000)
# #
# Amount of data per email text/* mimepart, that will be run through # Amount of data per email text/* mimepart, that will be run through
# rawbody rules. # rawbody rules.
# #
#rawbody_part_scan_size {{ spamassassin_body_part_scan_size }} rawbody_part_scan_size {{ spamassassin_body_part_scan_size }}
{% if spamassassin_shortcircuit_plugin %} {% if spamassassin_shortcircuit_plugin %}
loadplugin Mail::SpamAssassin::Plugin::Shortcircuit loadplugin Mail::SpamAssassin::Plugin::Shortcircuit