From 1b1716508e3994ae94af53584e473478b9e507b0 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Tue, 14 Apr 2020 13:23:49 +0200
Subject: [PATCH] Fixes #604, fixes #603. Support pyzor, give the possibility
 to disable RBLs

---
 defaults/main.yml                  | 10 +++++++++-
 tasks/spamassassin.yml             |  7 +++++++
 templates/spamassassin-local.cf.j2 |  9 +++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 0750e8e..597e607 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -12,13 +12,14 @@ spamassassin_home: /etc/mail/spamassassin
 spamassassin_rh_packages:
   - spamassassin
   - spamassassin-iXhash2
+  - pyzor
 
 spamassassin_sql_rh_packages:
   - perl-DBD-Pg
   - perl-DBI
 
 spamassassin_spamd_port: 783
-spamassassin_conf_dir: '/etc/mail/spamassassin'
+spamassassin_conf_dir: '{{ spamassassin_home }}'
 spamassassin_sysconfig_file: '/etc/sysconfig/spamassassin'
 # Only postgresql support for the time being
 spamassassin_db_user_config: True
@@ -67,3 +68,10 @@ spamassassin_milter_whitelisted_networks: '127.0.0.1/8'
 spamassassin_milter_reject_limit: 15
 spamassassin_milter_change_headers: True
 
+spamassassin_disable_rbls: False
+spamassassin_disabled_rbls_list: []
+#  - bldomain
+#  - sorbs.net
+
+spamassassin_enable_pyzor: True
+
diff --git a/tasks/spamassassin.yml b/tasks/spamassassin.yml
index 1d271ec..75d11be 100644
--- a/tasks/spamassassin.yml
+++ b/tasks/spamassassin.yml
@@ -57,6 +57,13 @@
       template: src=spamassassin_sysconfig.j2 dest=/etc/sysconfig/spamassassin owner=root group=root mode=0444
       notify: Reload spamassassin
 
+    - name: Configure pyzor if enabled
+      command: pyzor --homedir {{ spamassassin_conf_dir }} discover
+      args:
+        creates: '{{ spamassassin_conf_dir }}/servers'
+      when: spamassassin_enable_pyzor | bool
+      notify: Reload spamassassin
+
   tags: [ 'spamassassin', 'spamassassin_conf' ]
   
 - name: Install the Spamassassin DB configuration
diff --git a/templates/spamassassin-local.cf.j2 b/templates/spamassassin-local.cf.j2
index a734ea9..704e053 100644
--- a/templates/spamassassin-local.cf.j2
+++ b/templates/spamassassin-local.cf.j2
@@ -17,3 +17,12 @@ use_bayes 0
 {% if spamassassin_auto_whitelist %}
 use_auto_whitelist 1
 {% endif %}
+{% if spamassassin_disable_rbls %}
+skip_rbl_checks 1
+{% endif %}
+{% for rbl in  spamassassin_disabled_rbls_list %}
+dns_query_restriction deny {{ rbl }}
+{% endfor %}
+{% if spamassassin_enable_pyzor %}
+pyzor_options --homedir {{ spamassassin_conf_dir }}
+{% endif %}