From 3746205a603b9ee8b049f6b170293acaae424a62 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Sun, 11 Sep 2022 11:44:58 +0200
Subject: [PATCH] move spam messages in the before sieve hook

---
 Dockerfile                                    | 4 ++--
 rootfs/etc/confd/conf.d/spam.sieve.toml       | 2 +-
 rootfs/etc/confd/templates/90-sieve.conf.tmpl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 607024f..9e71e6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -95,9 +95,9 @@ RUN addgroup -g 1111 vmail
 RUN adduser -u 1111 -h /var/lib/vmail -D -G vmail vmail
 
 RUN mkdir -p /etc/dovecot/conf.d
-RUN mkdir /var/lib/vmail/sieve-after/
+RUN mkdir /var/lib/vmail/sieve-before/
 
-RUN chown -R vmail:vmail /var/lib/vmail/sieve-after/
+RUN chown -R vmail:vmail /var/lib/vmail/sieve-before/
 
 EXPOSE 143 4190 6334 7777
 
diff --git a/rootfs/etc/confd/conf.d/spam.sieve.toml b/rootfs/etc/confd/conf.d/spam.sieve.toml
index f4b1072..7bc23d1 100644
--- a/rootfs/etc/confd/conf.d/spam.sieve.toml
+++ b/rootfs/etc/confd/conf.d/spam.sieve.toml
@@ -1,6 +1,6 @@
 [template]
 src = "spam.sieve.tmpl"
-dest = "/var/lib/vmail/sieve-after/spam.sieve"
+dest = "/var/lib/vmail/sieve-before/spam.sieve"
 gid = 1111
 uid = 1111
 mode = "0660"
diff --git a/rootfs/etc/confd/templates/90-sieve.conf.tmpl b/rootfs/etc/confd/templates/90-sieve.conf.tmpl
index 95569e4..31271f8 100644
--- a/rootfs/etc/confd/templates/90-sieve.conf.tmpl
+++ b/rootfs/etc/confd/templates/90-sieve.conf.tmpl
@@ -1,3 +1,3 @@
 plugin {
-  sieve_after = /var/lib/vmail/sieve-after/
+  sieve_before = /var/lib/vmail/sieve-before/
 }