infra/ansible
4
5
Fork 5
Code Issues 6 Pull Requests 3 Activity

Use more variables for mail templates.

Browse Source
This commit is contained in:
Markus 2016-02-15 21:30:24 +01:00
parent fbcac9f826
commit 68cdb42b77
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/mail/templates/dovecot/local.conf.j2
View File

@ -97,6 +97,6 @@ namespace inbox {
} }
mailbox "Sent Messages" { mailbox "Sent Messages" {
special_use = \Sent special_use = \Sent
} }
} }

2
roles/mail/templates/postfix/ldap-aliases.cf.j2
View File

@ -1,6 +1,6 @@
server_host = {{ ldap_host }} server_host = {{ ldap_host }}
start_tls = yes start_tls = yes
#tls_ca_cert_file = #tls_ca_cert_file = TODO
#tls_require_cert = yes #tls_require_cert = yes
bind = yes bind = yes
bind_dn = {{ ldap_binddn }} bind_dn = {{ ldap_binddn }}

4
roles/mail/templates/postfix/ldap-virtual-maps.cf.j2
View File

@ -1,13 +1,13 @@
server_host = {{ ldap_host }} server_host = {{ ldap_host }}
start_tls = yes start_tls = yes
#tls_ca_cert_file = #tls_ca_cert_file = TODO
#tls_require_cert = yes #tls_require_cert = yes
bind = yes bind = yes
bind_dn = {{ ldap_binddn }} bind_dn = {{ ldap_binddn }}
bind_pw = {{ ldap_bindpw }} bind_pw = {{ ldap_bindpw }}
version = 3 version = 3
search_base = dc=binary-kitchen,dc=de search_base = {{ ldap_base }}
query_filter = (&(objectClass=mailUser)(mail=%s)) query_filter = (&(objectClass=mailUser)(mail=%s))
result_attribute = uid result_attribute = uid
result_format = %u/.maildir/ result_format = %u/.maildir/

13
roles/mail/templates/postfix/main.cf.j2
View File

@ -21,11 +21,10 @@ inet_interfaces = all
message_size_limit = 50000000 message_size_limit = 50000000
recipient_delimiter = + recipient_delimiter = +
mydomain = binary-kitchen.com mydomain = {{ mail_domain }}
myhostname = ptest.binary-kitchen.com myhostname = {{ ansible_fqdn }}
myorigin = binary-kitchen.com myorigin = {{ ansible_fqdn }}
# fixme mydestination = localhost.{{ mail_domain }}, localhost
mydestination = ptest.binary.kitchen, localhost.binary.kitchen, localhost
mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
alias_maps = hash:/etc/aliases alias_maps = hash:/etc/aliases
@ -69,7 +68,7 @@ smtpd_restriction_classes = rbl, rblgrey
rbl = reject_rbl_client sbl.spamhaus.org rbl = reject_rbl_client sbl.spamhaus.org
reject_rbl_client cbl.abuseat.org reject_rbl_client cbl.abuseat.org
rblgrey = reject_rbl_client sbl.spamhaus.org rblgrey = reject_rbl_client sbl.spamhaus.org
reject_rbl_client cbl.abuseat.org reject_rbl_client cbl.abuseat.org
check_policy_service unix:private/spfpolicy check_policy_service unix:private/spfpolicy
@ -78,7 +77,7 @@ rblgrey = reject_rbl_client sbl.spamhaus.org
content_filter = amavis:[127.0.0.1]:10024 content_filter = amavis:[127.0.0.1]:10024
receive_override_options = no_address_mappings receive_override_options = no_address_mappings
virtual_mailbox_domains = binary-kitchen.com virtual_mailbox_domains = {{ mail_domain }}
virtual_mailbox_maps = hash:/etc/postfix/virtual_mailbox virtual_mailbox_maps = hash:/etc/postfix/virtual_mailbox
virtual_alias_maps = hash:/etc/postfix/virtual_alias virtual_alias_maps = hash:/etc/postfix/virtual_alias
#virtual_mailbox_maps = ldap:/etc/postfix/ldap-virtual-maps.cf #virtual_mailbox_maps = ldap:/etc/postfix/ldap-virtual-maps.cf