use new s6-rc layout [skip ci]

2022-02-18 15:18:13 +01:00 · 2022-02-18 15:18:13 +01:00 · d04838166e
commit d04838166e
parent 9bd1e99e64
4 changed files with 2 additions and 16 deletions
--- a/rootfs/etc/confd/conf.d/sieve-ldap.conf.toml
+++ b/rootfs/etc/confd/conf.d/sieve-ldap.conf.toml
@ -1,3 +0,0 @@
-[template]
-src = "sieve-ldap.conf.tmpl"
-dest = "/etc/dovecot/sieve-ldap.conf"
--- 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
--- a/rootfs/etc/confd/templates/sieve-ldap.conf.tmpl
+++ b/rootfs/etc/confd/templates/sieve-ldap.conf.tmpl
@ -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
--- a/rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/dependencies
+++ b/rootfs/etc/s6-overlay/s6-rc.d/sieve-rules/dependencies
@ -0,0 +1 @@
+confd