From dc4b0d21ea47bcf9b93c2721d4e05ad323b9f761 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Thu, 27 Sep 2018 16:01:21 +0200
Subject: [PATCH] Clean the dovecot configuration dir

---
 core/dovecot/conf/bin/mailtrain                | 3 +++
 core/dovecot/conf/dovecot.conf                 | 6 +++---
 core/dovecot/{sieve => conf}/report-ham.sieve  | 0
 core/dovecot/{sieve => conf}/report-spam.sieve | 0
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100755 core/dovecot/conf/bin/mailtrain
 rename core/dovecot/{sieve => conf}/report-ham.sieve (100%)
 rename core/dovecot/{sieve => conf}/report-spam.sieve (100%)

diff --git a/core/dovecot/conf/bin/mailtrain b/core/dovecot/conf/bin/mailtrain
new file mode 100755
index 00000000..cfa36398
--- /dev/null
+++ b/core/dovecot/conf/bin/mailtrain
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rspamc -h antispam:11334 -P mailu "learn_$1" /dev/stdin <&0
diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index aaf4f36e..877a1a3c 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -142,7 +142,7 @@ plugin {
   sieve_global_extensions = +vnd.dovecot.execute
 
   # Sieve execute
-  sieve_execute_bin_dir = /var/lib/dovecot/bin
+  sieve_execute_bin_dir = /etc/dovecot/bin
 
   # Send vacation replies even for aliases
   # See the Pigeonhole documentation about warnings: http://wiki2.dovecot.org/Pigeonhole/Sieve/Extensions/Vacation
@@ -161,11 +161,11 @@ plugin {
   # Learn from spam
   imapsieve_mailbox1_name = Junk
   imapsieve_mailbox1_causes = COPY
-  imapsieve_mailbox1_before = file:/var/lib/dovecot/report-spam.sieve
+  imapsieve_mailbox1_before = file:/etc/dovecot/report-spam.sieve
   imapsieve_mailbox2_name = *
   imapsieve_mailbox2_from = Junk
   imapsieve_mailbox2_causes = COPY
-  imapsieve_mailbox2_before = file:/var/lib/dovecot/report-ham.sieve
+  imapsieve_mailbox2_before = file:/etc/dovecot/report-ham.sieve
 }
 
 ###############
diff --git a/core/dovecot/sieve/report-ham.sieve b/core/dovecot/conf/report-ham.sieve
similarity index 100%
rename from core/dovecot/sieve/report-ham.sieve
rename to core/dovecot/conf/report-ham.sieve
diff --git a/core/dovecot/sieve/report-spam.sieve b/core/dovecot/conf/report-spam.sieve
similarity index 100%
rename from core/dovecot/sieve/report-spam.sieve
rename to core/dovecot/conf/report-spam.sieve