diff --git a/Dockerfile b/Dockerfile index 94a8613..2d89a8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,13 @@ FROM thallian/confd-env:latest RUN apk add --no-cache dovecot dovecot-ldap dovecot-pigeonhole-plugin -RUN mkdir /etc/dovecot/sieve-after/ +RUN addgroup -g 1111 vmail +RUN adduser -u 1111 -h /var/lib/vmail -D -G vmail vmail -RUN addgroup vmail -RUN adduser -h /var/lib/vmail -D -G vmail vmail +RUN mkdir /var/lib/vmail/sieve-after/ +RUN chown vmail:vmail /var/lib/vmail/sieve-after/ -EXPOSE 143 6334 7777 +EXPOSE 143 4190 6334 7777 VOLUME /var/lib/vmail/mail/ /etc/ssl/mail diff --git a/rootfs/etc/confd/conf.d/spam.sieve.toml b/rootfs/etc/confd/conf.d/spam.sieve.toml index aabc538..f4b1072 100644 --- a/rootfs/etc/confd/conf.d/spam.sieve.toml +++ b/rootfs/etc/confd/conf.d/spam.sieve.toml @@ -1,3 +1,6 @@ [template] src = "spam.sieve.tmpl" -dest = "/etc/dovecot/sieve-after/spam.sieve" +dest = "/var/lib/vmail/sieve-after/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 1dc230b..1901943 100644 --- a/rootfs/etc/confd/templates/90-sieve.conf.tmpl +++ b/rootfs/etc/confd/templates/90-sieve.conf.tmpl @@ -1,4 +1,4 @@ plugin { sieve = file:~/sieve;active=~/.dovecot.sieve - sieve_after = /etc/dovecot/sieve-after + sieve_after = /var/lib/vmail/sieve-after/ } diff --git a/rootfs/etc/cont-init.d/02-sieve-rules b/rootfs/etc/cont-init.d/02-sieve-rules index 80d7af1..df0c4ad 100644 --- a/rootfs/etc/cont-init.d/02-sieve-rules +++ b/rootfs/etc/cont-init.d/02-sieve-rules @@ -1,3 +1,3 @@ #!/usr/bin/with-contenv sh -sievec /etc/dovecot/sieve-after/spam.sieve +s6-setuidgid vmail sievec /var/lib/vmail/sieve-after/spam.sieve