container/postfix
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rip out ldap

Browse source
This commit is contained in:
Sebastian Hugentobler 2021-08-23 15:20:57 +02:00
parent bc0b3eaf79
commit 5a2efbec22
Signed by: shu
GPG key ID: BB32CF3CA052C2F0
16 changed files with 71 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rootfs/bin/restart-services
View file

@ -1,4 +0,0 @@
#!/usr/bin/with-contenv sh
s6-svc -t /var/run/s6/services/postfix
s6-svc -t /var/run/s6/services/spamass-milter

3
rootfs/etc/confd/conf.d/ldap-virtual-alias-maps.cf.toml
View file

@ -1,3 +0,0 @@
[template]
src = "ldap-virtual-alias-maps.cf.tmpl"
dest = "/etc/postfix/ldap-virtual-alias-maps.cf"

3
rootfs/etc/confd/conf.d/ldap-virtual-mailbox-domains.cf.toml
View file

@ -1,3 +0,0 @@
[template]
src = "ldap-virtual-mailbox-domains.cf.tmpl"
dest = "/etc/postfix/ldap-virtual-mailbox-domains.cf"

3
rootfs/etc/confd/conf.d/ldap-virtual-mailbox-maps.cf.toml
View file

@ -1,3 +0,0 @@
[template]
src = "ldap-virtual-mailbox-maps.cf.tmpl"
dest = "/etc/postfix/ldap-virtual-mailbox-maps.cf"

3
rootfs/etc/confd/conf.d/pgsql-virtual-alias-maps.cf.toml Normal file
View file

@ -0,0 +1,3 @@
[template]
src = "pgsql-virtual-alias-maps.cf.tmpl"
dest = "/etc/postfix/pgsql-virtual-alias-maps.cf"

3
rootfs/etc/confd/conf.d/pgsql-virtual-mailbox-domains.cf.toml Normal file
View file

@ -0,0 +1,3 @@
[template]
src = "pgsql-virtual-mailbox-domains.cf.tmpl"
dest = "/etc/postfix/pgsql-virtual-mailbox-domains.cf"

9
rootfs/etc/confd/templates/ldap-virtual-alias-maps.cf.tmpl
View file

@ -1,9 +0,0 @@
server_host = {{getenv "LDAP_URI"}}
start_tls = {{getenv "LDAP_STARTTLS" "yes"}}
bind = yes
bind_dn = {{getenv "LDAP_BIND_DN" }}
bind_pw = {{getenv "LDAP_BIND_PASSWORD"}}
search_base = {{getenv "LDAP_MAILBOX_SEARCH_BASE"}}
version = 3
query_filter = {{getenv "LDAP_ALIAS_QUERY_FILTER"}}
result_attribute = {{getenv "LDAP_MAILBOX_RESULT_ATTRIBUTE" "cn"}}

9
rootfs/etc/confd/templates/ldap-virtual-mailbox-domains.cf.tmpl
View file

@ -1,9 +0,0 @@
server_host = {{getenv "LDAP_URI"}}
start_tls = {{getenv "LDAP_STARTTLS" "yes"}}
bind = yes
bind_dn = {{getenv "LDAP_BIND_DN" }}
bind_pw = {{getenv "LDAP_BIND_PASSWORD"}}
search_base = {{getenv "LDAP_DOMAIN_SEARCH_BASE"}}
version = 3
query_filter = {{getenv "LDAP_DOMAIN_QUERY_FILTER"}}
result_attribute = {{getenv "LDAP_DOMAIN_RESULT_ATTRIBUTE" "dc"}}

9
rootfs/etc/confd/templates/ldap-virtual-mailbox-maps.cf.tmpl
View file

@ -1,9 +0,0 @@
server_host = {{getenv "LDAP_URI"}}
start_tls = {{getenv "LDAP_STARTTLS" "yes"}}
bind = yes
bind_dn = {{getenv "LDAP_BIND_DN"}}
bind_pw = {{getenv "LDAP_BIND_PASSWORD"}}
search_base = {{getenv "LDAP_MAILBOX_SEARCH_BASE"}}
version = 3
query_filter = {{getenv "LDAP_MAILBOX_QUERY_FILTER"}}
result_attribute = {{getenv "LDAP_MAILBOX_RESULT_ATTRIBUTE" "cn"}}

19
rootfs/etc/confd/templates/main.cf.tmpl
View file

@ -15,13 +15,12 @@ mailbox_transport = lmtp:{{getenv "LMTP_HOST"}}
mailbox_size_limit = {{getenv "MAILBOX_SIZELIMIT" "0"}}
smtpd_banner = {{getenv "SMTP_BANNER"}} $myhostname ESMTP $mail_name
virtual_mailbox_domains = proxy:ldap:/etc/postfix/ldap-virtual-mailbox-domains.cf
virtual_mailbox_maps = proxy:ldap:/etc/postfix/ldap-virtual-mailbox-maps.cf
virtual_alias_maps = proxy:ldap:/etc/postfix/ldap-virtual-alias-maps.cf
virtual_mailbox_domains = pgsql:/etc/postfix/pgsql-virtual-mailbox-domains.cf
virtual_alias_maps = pgsql:/etc/postfix/pgsql-virtual-alias-maps.cf
virtual_transport = lmtp:inet:{{getenv "LMTP_HOST"}}:{{getenv "LMTP_PORT"}}
smtpd_tls_key_file=/etc/ssl/mail/{{getenv "CERT_DOMAIN"}}.key
smtpd_tls_cert_file=/etc/ssl/mail/{{getenv "CERT_DOMAIN"}}.crt
smtpd_tls_key_file=/etc/ssl/mail/tls.key
smtpd_tls_cert_file=/etc/ssl/mail/tls.crt
smtp_tls_security_level = {{getenv "TLS_SECURITY_LEVEL" "may"}}
smtp_tls_auth_only = yes
@ -59,12 +58,12 @@ smtpd_sasl_path = inet:{{getenv "DOVECOT_HOST"}}:{{getenv "DOVECOT_AUTH_PORT"}}
smtpd_sasl_auth_enable = yes
smtpd_relay_restrictions = permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination
smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, defer_unauth_destination
smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, defer_unauth_destination, reject_unverified_recipient
smtpd_milters =
unix:/var/run/spamass-milter/spamass.sock
inet:{{getenv "DKIM_HOST"}}:{{getenv "DKIM_PORT"}}
non_smtpd_milters = $smtpd_milters
#smtpd_milters =
# unix:/var/run/spamass-milter/spamass.sock
# inet:{{getenv "DKIM_HOST"}}:{{getenv "DKIM_PORT"}}
#non_smtpd_milters = $smtpd_milters
milter_default_action = accept
milter_macro_daemon_name = ORIGINATING
milter_connect_macros = "i j {daemon_name} v {if_name} _"

5
rootfs/etc/confd/templates/pgsql-virtual-alias-maps.cf.tmpl Normal file
View file

@ -0,0 +1,5 @@
hosts = {{ getenv "DB_HOST" }}
user = {{ getenv "DB_USER" "email" }}
password = {{ getenv "DB_PASSWORD" }}
dbname = {{ getenv "DB_NAME" "email" }}
query = SELECT destination FROM virtual_aliases WHERE source='%s'

5
rootfs/etc/confd/templates/pgsql-virtual-mailbox-domains.cf.tmpl Normal file
View file

@ -0,0 +1,5 @@
hosts = {{ getenv "DB_HOST" }}
user = {{ getenv "DB_USER" "email" }}
password = {{ getenv "DB_PASSWORD" }}
dbname = {{ getenv "DB_NAME" "email" }}
query = SELECT 1 FROM virtual_domains WHERE name='%s'

2
rootfs/etc/services.d/spamass-milter/run
View file

@ -1,3 +1,3 @@
#!/usr/bin/with-contenv sh
exec s6-setuidgid postfix spamass-milter -u postmaster -p /var/run/spamass-milter/spamass.sock -- -d $SPAMASSASSIN_HOST
#exec s6-setuidgid postfix spamass-milter -u postmaster -p /var/run/spamass-milter/spamass.sock -- -d $SPAMASSASSIN_HOST

1
rootfs/var/spool/incron/root
View file

@ -1 +0,0 @@
/etc/ssl/mail IN_ATTRIB /bin/restart-services