From 1c01fa90b19c9f74bd04be5cd1bf0b559384a0c6 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Tue, 7 Mar 2017 16:00:42 +0100
Subject: [PATCH 1/4] =?UTF-8?q?Mise=20=C3=A0=20jour=20vers=20la=202.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ed40735..c2e0df1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@
 
 SOURCE=eole-rspamd
 VERSION=0.1
-EOLE_VERSION=2.4
-EOLE_RELEASE=2.4.2
+EOLE_VERSION=2.6
+EOLE_RELEASE=2.6.0
 PKGAPPS=non
 
 ################################

From 5df624740fc9102a1860a92ea45905096a14d755 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Tue, 7 Mar 2017 16:06:19 +0100
Subject: [PATCH 2/4] =?UTF-8?q?Mise=20=C3=A0=20jour=20vers=202.6.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c2e0df1..2f55dec 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 SOURCE=eole-rspamd
 VERSION=0.1
 EOLE_VERSION=2.6
-EOLE_RELEASE=2.6.0
+EOLE_RELEASE=2.6.1
 PKGAPPS=non
 
 ################################

From 7217f70f50f47474d8924d0a4c6bd779ee8a804c Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Tue, 7 Mar 2017 16:13:36 +0100
Subject: [PATCH 3/4] Test hook build

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d9ba24d..2acb61a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Installation :
 
 
+
 ## Ajouter les dépôts rspamd:
 
 ``` bash

From 4170f61bb3fb67b5b512df3162abf4b9ce58b49e Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Tue, 3 Oct 2017 10:45:02 +0200
Subject: [PATCH 4/4] =?UTF-8?q?Ajout=20de=20la=20possibilit=C3=A9=20de=20c?=
 =?UTF-8?q?r=C3=A9er=20des=20r=C3=AAgles=20de=20filtrage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

En mode expert il est maintenant possible de créer des rêgles
de filtarge supplémentaires pour rspamd. Les rêgles sont de
type "regexp" et suivent la documentation de rspamd.

https://rspamd.com/doc/tutorials/writing_rules.html

Creole génère un fichier de configuration supplémentaire :
/etc/rspamd/rspamd.local.lua
---
 dicos/22_rspamd.xml   | 22 ++++++++++++++++++++++
 tmpl/rspamd.local.lua | 11 +++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 tmpl/rspamd.local.lua

diff --git a/dicos/22_rspamd.xml b/dicos/22_rspamd.xml
index 2f3a56d..c8b8aaf 100644
--- a/dicos/22_rspamd.xml
+++ b/dicos/22_rspamd.xml
@@ -24,6 +24,14 @@
 			<variable name='activer_whitelist_domaine' type='oui/non' description='Voulez-vous filtrer les mails qui proviennent des domaines locaux ?'>
 				<value>non</value>
 			</variable>
+			<variable name='enable_rules' type='oui/non' description='Voulez-vous ajouter des rêgles de filtrage supplémentaires (regexp) ?' mode='expert'>
+				<value>non</value>
+			</variable>
+			<variable name='rspamd_regexp_rule' type='string' description='Nom de la règle de filtrage' mode='expert' multi='True'/>
+			<variable name='rs_rule_desc' type='string' description='Déscription de la rêgle' mode='expert'/>
+			<variable name='rs_rule_regexp' type='string' description='Expression régulière de recherche' mode='expert'/>
+			<variable name='rs_rule_symbol' type='string' description='Marqeur à ajouter aux entêtes' mode='expert'/>
+			<variable name='rs_rule_score' type='string' description='Score à ajouter aux X-SPAM-SCORE' mode='expert'/>
 		</family>
     </variables>
     <constraints>
@@ -36,6 +44,20 @@
             <param>non</param>
 			<target type='filelist'>whitelist</target>
         </condition>
+		<condition name='disabled_if_in' source='enable_rules'>
+            <param>non</param>
+			<target type='variable'>rspamd_regexp_rule</target>
+			<target type='variable'>rs_rule_desc</target>
+			<target type='variable'>rs_rule_regexp</target>
+			<target type='variable'>rs_rule_symbol</target>
+			<target type='variable'>rs_rule_score</target>
+        </condition>
+		<group master='rspamd_regexp_rule'>
+			<slave>rs_rule_desc</slave>
+			<slave>rs_rule_regexp</slave>
+			<slave>rs_rule_symbol</slave>
+			<slave>rs_rule_score</slave>
+		</group>
     </constraints>
     <help>
         <variable name='activer_rspamd'>rspamd est un filtre antispam rapide qui supporte l'apprentissage par déclaration des utilisateurs via le déplacement dans la boite 'spam'</variable>
diff --git a/tmpl/rspamd.local.lua b/tmpl/rspamd.local.lua
new file mode 100644
index 0000000..39e85f7
--- /dev/null
+++ b/tmpl/rspamd.local.lua
@@ -0,0 +1,11 @@
+%if %%getVar('enable_rules','non') == 'oui'
+   %for %%rule in %%rspamd_regexp_rule
+config['regexp']['%%rule.rs_rule_symbol'] = {
+	re = '%%rule.rs_rule_regexp',
+	score = %%rule.rs_rule_score,
+	description = '%%rule.rs_rule_desc',
+	group = 'Eole Rules'
+
+}
+   %end for
+%end if