use new s6-rc layout [skip CI]

2022-02-18 09:23:28 +01:00 · 2022-02-18 09:23:28 +01:00 · 9bd1e99e64
commit 9bd1e99e64
parent 230872cf0d
12 changed files with 29 additions and 28 deletions
--- 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
+#!/bin/sh

 s6-setuidgid vmail sievec /var/lib/vmail/sieve-after/spam.sieve
--- a/rootfs/etc/fix-attrs.d/00-mails
+++ b/rootfs/etc/fix-attrs.d/00-mails
@ -1 +0,0 @@
-/var/lib/vmail/mail true vmail 0640 0750
--- a/rootfs/etc/s6-overlay/s6-rc.d/dovecot/dependencies
+++ b/rootfs/etc/s6-overlay/s6-rc.d/dovecot/dependencies
@ -0,0 +1,2 @@
+confd
+sieve-rules
--- a/rootfs/etc/s6-overlay/s6-rc.d/dovecot/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/dovecot/run
@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec dovecot -F
--- a/rootfs/etc/s6-overlay/s6-rc.d/dovecot/type
+++ b/rootfs/etc/s6-overlay/s6-rc.d/dovecot/type
@ -0,0 +1 @@
+longrun
--- a/rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/type
+++ b/rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/type
@ -0,0 +1 @@
+oneshot
--- a/rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/up
+++ b/rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/up
@ -0,0 +1 @@
+sieve-rules
--- a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/dovecot
+++ b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/dovecot
--- a/rootfs/etc/services.d/dovecot/run
+++ b/rootfs/etc/services.d/dovecot/run
@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-exec dovecot -F