From 855f95a0b0a2eef7da760f515993ed2988d5b665 Mon Sep 17 00:00:00 2001
From: VC <veretcle+framagit@mateu.be>
Date: Thu, 5 Dec 2019 07:13:29 +0100
Subject: [PATCH] Ajustement de la taille max des messages, ajustement divers

---
 roles/spamassassin/files/local.cf     |  1 +
 roles/spamassassin/files/spamassassin | 33 +++++++++++++++++++++++++++
 roles/spamassassin/tasks/main.yml     |  7 ++++++
 3 files changed, 41 insertions(+)
 create mode 100644 roles/spamassassin/files/spamassassin

diff --git a/roles/spamassassin/files/local.cf b/roles/spamassassin/files/local.cf
index ef59828..9fba777 100644
--- a/roles/spamassassin/files/local.cf
+++ b/roles/spamassassin/files/local.cf
@@ -67,6 +67,7 @@ score		LOCAL_BITCOIN	10.0
 whitelist_from *@chichiclothing.com
 
 # Blacklist manuel
+blacklist_from *@jooble.com
 blacklist_from *@broadband-search.com
 blacklist_from *@madberry.com
 blacklist_from *@innov-xxi.pt
diff --git a/roles/spamassassin/files/spamassassin b/roles/spamassassin/files/spamassassin
new file mode 100644
index 0000000..e3ac424
--- /dev/null
+++ b/roles/spamassassin/files/spamassassin
@@ -0,0 +1,33 @@
+# /etc/default/spamassassin
+# Duncan Findlay
+
+# WARNING: please read README.spamd before using.
+# There may be security risks.
+
+# Prior to version 3.4.2-1, spamd could be enabled by setting
+# ENABLED=1 in this file. This is no longer supported. Instead, please
+# use the update-rc.d command, invoked for example as "update-rc.d
+# spamassassin enable", to enable the spamd service.
+
+# Options
+# See man spamd for possible options. The -d option is automatically added.
+
+# SpamAssassin uses a preforking model, so be careful! You need to
+# make sure --max-children is not set to anything higher than 5,
+# unless you know what you're doing.
+
+OPTIONS="--create-prefs --max-children 5 --helper-home-dir -s 26214400"
+
+# Pid file
+# Where should spamd write its PID to file? If you use the -u or
+# --username option above, this needs to be writable by that user.
+# Otherwise, the init script will not be able to shut spamd down.
+PIDFILE="/var/run/spamd.pid"
+
+# Set nice level of spamd
+#NICE="--nicelevel 15"
+
+# Cronjob
+# Set to anything but 0 to enable the cron job to automatically update
+# spamassassin's rules on a nightly basis
+CRON=0
diff --git a/roles/spamassassin/tasks/main.yml b/roles/spamassassin/tasks/main.yml
index 578ca40..3edade3 100644
--- a/roles/spamassassin/tasks/main.yml
+++ b/roles/spamassassin/tasks/main.yml
@@ -13,3 +13,10 @@
       dest: /etc/spamassassin/local.cf
   notify:
       - restart spamassassin
+
+- name: default configuration files
+  copy:
+      src: ./files/spamassassin
+      dest: /etc/default/spamassassin
+  notify:
+      - restart spamassassin