1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/conf/aliases.example Tue Oct 27 21:16:26 2015 +0100
1.3 @@ -0,0 +1,1 @@
1.4 +calendar: root
2.1 --- a/conf/exim/aliases.example Tue Oct 27 19:21:21 2015 +0100
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,1 +0,0 @@
2.4 -calendar: root
3.1 --- a/conf/exim/ldap/010_exim4-config_ldap_people_outgoing Tue Oct 27 19:21:21 2015 +0100
3.2 +++ b/conf/exim/ldap/010_exim4-config_ldap_people_outgoing Tue Oct 27 21:16:26 2015 +0100
3.3 @@ -7,8 +7,8 @@
3.4 no_expn
3.5 no_verify
3.6 condition = ${if eq {}{${lookup ldap{ \
3.7 - user="$ldap_service_bind_dn" \
3.8 - pass=$ldap_service_password \
3.9 - ldap://$ldap_host:$ldap_port/$ldap_base_dn?mail?sub?LDAP_PERSON_OUTGOING_QUERY} \
3.10 + user="LDAP_SERVICE_BIND_DN" \
3.11 + pass=LDAP_SERVICE_PASSWORD \
3.12 + ldap://LDAP_HOST:LDAP_PORT/LDAP_BASE_DN?mail?sub?LDAP_PERSON_OUTGOING_QUERY} \
3.13 }}{no}{yes}}
3.14 transport = people_outgoing_transport
4.1 --- a/conf/exim/ldap/020_exim4-config_ldap_people Tue Oct 27 19:21:21 2015 +0100
4.2 +++ b/conf/exim/ldap/020_exim4-config_ldap_people Tue Oct 27 21:16:26 2015 +0100
4.3 @@ -4,9 +4,9 @@
4.4 debug_print = "R: ldap_person for $local_part@$domain"
4.5 driver = accept
4.6 condition = ${if eq {}{${lookup ldap{ \
4.7 - user="$ldap_service_bind_dn" \
4.8 - pass=$ldap_service_password \
4.9 - ldap://$ldap_host:$ldap_port/$ldap_base_dn?mail?sub?LDAP_PERSON_QUERY} \
4.10 + user="LDAP_SERVICE_BIND_DN" \
4.11 + pass=LDAP_SERVICE_PASSWORD \
4.12 + ldap://LDAP_HOST:LDAP_PORT/LDAP_BASE_DN?mail?sub?LDAP_PERSON_QUERY} \
4.13 }}{no}{yes}}
4.14 transport = people_transport
4.15 cannot_route_message = Unknown user
5.1 --- a/conf/exim/ldap/020_exim4-config_ldap_people_outgoing_recipients Tue Oct 27 19:21:21 2015 +0100
5.2 +++ b/conf/exim/ldap/020_exim4-config_ldap_people_outgoing_recipients Tue Oct 27 21:16:26 2015 +0100
5.3 @@ -11,9 +11,9 @@
5.4 condition = ${if and { \
5.5 {eq {people-outgoing:}{${substr{0}{PEOPLE_OUTGOING}{${local_part}}}}} \
5.6 {!eq {}{${lookup ldap{ \
5.7 - user="$ldap_service_bind_dn" \
5.8 - pass=$ldap_service_password \
5.9 - ldap://$ldap_host:$ldap_port/$ldap_base_dn?mail?sub?LDAP_PERSON_OUTGOING_RECIPIENT_QUERY} \
5.10 + user="LDAP_SERVICE_BIND_DN" \
5.11 + pass=LDAP_SERVICE_PASSWORD \
5.12 + ldap://LDAP_HOST:LDAP_PORT/LDAP_BASE_DN?mail?sub?LDAP_PERSON_OUTGOING_RECIPIENT_QUERY} \
5.13 }}} \
5.14 }}
5.15 transport = people_outgoing_transport
6.1 --- a/conf/exim/ldap/020_exim4-config_ldap_resources Tue Oct 27 19:21:21 2015 +0100
6.2 +++ b/conf/exim/ldap/020_exim4-config_ldap_resources Tue Oct 27 21:16:26 2015 +0100
6.3 @@ -4,9 +4,9 @@
6.4 debug_print = "R: ldap_resource for $local_part@$domain"
6.5 driver = accept
6.6 condition = ${if eq {}{${lookup ldap{ \
6.7 - user="$ldap_service_bind_dn" \
6.8 - pass=$ldap_service_password \
6.9 - ldap://$ldap_host:$ldap_port/$ldap_base_dn?mail?sub?LDAP_RESOURCE_QUERY} \
6.10 + user="LDAP_SERVICE_BIND_DN" \
6.11 + pass=LDAP_SERVICE_PASSWORD \
6.12 + ldap://LDAP_HOST:LDAP_PORT/LDAP_BASE_DN?mail?sub?LDAP_RESOURCE_QUERY} \
6.13 }}{no}{yes}}
6.14 transport = resources_transport
6.15 cannot_route_message = Unknown user
7.1 --- a/conf/postfix/ldap/virtual_alias_maps_people.cf Tue Oct 27 19:21:21 2015 +0100
7.2 +++ b/conf/postfix/ldap/virtual_alias_maps_people.cf Tue Oct 27 21:16:26 2015 +0100
7.3 @@ -1,11 +1,11 @@
7.4 -server_host = $ldap_host
7.5 -server_port = $ldap_port
7.6 +server_host = LDAP_HOST
7.7 +server_port = LDAP_PORT
7.8 version = 3
7.9 -search_base = $ldap_base_dn
7.10 +search_base = LDAP_BASE_DN
7.11 scope = sub
7.12
7.13 -bind_dn = $ldap_service_bind_dn
7.14 -bind_pw = $ldap_service_password
7.15 +bind_dn = LDAP_SERVICE_BIND_DN
7.16 +bind_pw = LDAP_SERVICE_PASSWORD
7.17
7.18 query_filter = (&(|(mail=%s)(alias=%s))(objectclass=inetorgperson))
7.19 result_attribute = mail
8.1 --- a/conf/postfix/ldap/virtual_alias_maps_people_outgoing.cf Tue Oct 27 19:21:21 2015 +0100
8.2 +++ b/conf/postfix/ldap/virtual_alias_maps_people_outgoing.cf Tue Oct 27 21:16:26 2015 +0100
8.3 @@ -1,11 +1,11 @@
8.4 -server_host = $ldap_host
8.5 -server_port = $ldap_port
8.6 +server_host = LDAP_HOST
8.7 +server_port = LDAP_PORT
8.8 version = 3
8.9 -search_base = $ldap_base_dn
8.10 +search_base = LDAP_BASE_DN
8.11 scope = sub
8.12
8.13 -bind_dn = $ldap_service_bind_dn
8.14 -bind_pw = $ldap_service_password
8.15 +bind_dn = LDAP_SERVICE_BIND_DN
8.16 +bind_pw = LDAP_SERVICE_PASSWORD
8.17
8.18 query_filter = (&(|(mail=%s)(alias=%s))(objectclass=inetorgperson))
8.19 result_attribute = mail
9.1 --- a/conf/postfix/ldap/virtual_alias_maps_resources.cf Tue Oct 27 19:21:21 2015 +0100
9.2 +++ b/conf/postfix/ldap/virtual_alias_maps_resources.cf Tue Oct 27 21:16:26 2015 +0100
9.3 @@ -1,11 +1,11 @@
9.4 -server_host = $ldap_host
9.5 -server_port = $ldap_port
9.6 +server_host = LDAP_HOST
9.7 +server_port = LDAP_PORT
9.8 version = 3
9.9 -search_base = $ldap_base_dn
9.10 +search_base = LDAP_BASE_DN
9.11 scope = sub
9.12
9.13 -bind_dn = $ldap_service_bind_dn
9.14 -bind_pw = $ldap_service_password
9.15 +bind_dn = LDAP_SERVICE_BIND_DN
9.16 +bind_pw = LDAP_SERVICE_PASSWORD
9.17
9.18 query_filter = (&(|(mail=%s)(alias=%s))(&(!(objectclass=inetOrgPerson))(objectclass=mailRecipient)))
9.19 result_attribute = mail