From d04838166e5aac85e5abe36bf7aa59df9e1ccf13 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Fri, 18 Feb 2022 15:18:13 +0100
Subject: [PATCH] use new s6-rc layout [skip ci]

---
 rootfs/etc/confd/conf.d/sieve-ldap.conf.toml         |  3 ---
 rootfs/etc/confd/templates/10-logging.conf.tmpl      |  2 +-
 rootfs/etc/confd/templates/sieve-ldap.conf.tmpl      | 12 ------------
 .../etc/s6-overlay/s6-rc.d/sieve-rules/dependencies  |  1 +
 4 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 rootfs/etc/confd/conf.d/sieve-ldap.conf.toml
 delete mode 100644 rootfs/etc/confd/templates/sieve-ldap.conf.tmpl
 create mode 100644 rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/dependencies

diff --git a/rootfs/etc/confd/conf.d/sieve-ldap.conf.toml b/rootfs/etc/confd/conf.d/sieve-ldap.conf.toml
deleted file mode 100644
index db4b2f5..0000000
--- a/rootfs/etc/confd/conf.d/sieve-ldap.conf.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[template]
-src = "sieve-ldap.conf.tmpl"
-dest = "/etc/dovecot/sieve-ldap.conf"
diff --git a/rootfs/etc/confd/templates/10-logging.conf.tmpl b/rootfs/etc/confd/templates/10-logging.conf.tmpl
index 1bf3a23..387553e 100644
--- a/rootfs/etc/confd/templates/10-logging.conf.tmpl
+++ b/rootfs/etc/confd/templates/10-logging.conf.tmpl
@@ -1 +1 @@
-log_path = /dev/stderr
+log_path = /dev/stdout
diff --git a/rootfs/etc/confd/templates/sieve-ldap.conf.tmpl b/rootfs/etc/confd/templates/sieve-ldap.conf.tmpl
deleted file mode 100644
index 7cef4ff..0000000
--- a/rootfs/etc/confd/templates/sieve-ldap.conf.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-hosts = {{getenv "LDAP_SIEVE_HOST"}}
-dn = {{getenv "LDAP_BIND_DN"}}
-dnpass = {{getenv "LDAP_BIND_PASSWORD"}}
-sasl_bind = no
-tls = {{getenv "LDAP_USE_TLS" "yes"}}
-ldap_version = 3
-base = {{getenv "LDAP_BASE_DN"}}
-deref = never
-scope = subtree
-sieve_ldap_filter = {{getenv "LDAP_PASS_FILTER"}}
-sieve_ldap_script_attr = {{getenv "LDAP_SIEVE_ATTRIBUTE" "sieve"}}
-sieve_ldap_mod_attr = modifyTimestamp
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/dependencies b/rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/dependencies
new file mode 100644
index 0000000..7ba7514
--- /dev/null
+++ b/rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/dependencies
@@ -0,0 +1 @@
+confd