# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1445976986 -3600
# Node ID 6c1808efb8c9e5b9495037e5697dd70957a67ed6
# Parent  afe204194ca23ad422ee06e46c864c5fd6059879
Moved aliases.example above the system-specific directories.
Introduced LDAP_* placeholders in the LDAP-related files.

diff -r afe204194ca2 -r 6c1808efb8c9 conf/aliases.example
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/aliases.example	Tue Oct 27 21:16:26 2015 +0100
@@ -0,0 +1,1 @@
+calendar: root
diff -r afe204194ca2 -r 6c1808efb8c9 conf/exim/aliases.example
--- a/conf/exim/aliases.example	Tue Oct 27 19:21:21 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-calendar: root
diff -r afe204194ca2 -r 6c1808efb8c9 conf/exim/ldap/010_exim4-config_ldap_people_outgoing
--- a/conf/exim/ldap/010_exim4-config_ldap_people_outgoing	Tue Oct 27 19:21:21 2015 +0100
+++ b/conf/exim/ldap/010_exim4-config_ldap_people_outgoing	Tue Oct 27 21:16:26 2015 +0100
@@ -7,8 +7,8 @@
   no_expn
   no_verify
   condition = ${if eq {}{${lookup ldap{ \
-    user="$ldap_service_bind_dn" \
-    pass=$ldap_service_password \
-    ldap://$ldap_host:$ldap_port/$ldap_base_dn?mail?sub?LDAP_PERSON_OUTGOING_QUERY} \
+    user="LDAP_SERVICE_BIND_DN" \
+    pass=LDAP_SERVICE_PASSWORD \
+    ldap://LDAP_HOST:LDAP_PORT/LDAP_BASE_DN?mail?sub?LDAP_PERSON_OUTGOING_QUERY} \
     }}{no}{yes}}
   transport = people_outgoing_transport
diff -r afe204194ca2 -r 6c1808efb8c9 conf/exim/ldap/020_exim4-config_ldap_people
--- a/conf/exim/ldap/020_exim4-config_ldap_people	Tue Oct 27 19:21:21 2015 +0100
+++ b/conf/exim/ldap/020_exim4-config_ldap_people	Tue Oct 27 21:16:26 2015 +0100
@@ -4,9 +4,9 @@
   debug_print = "R: ldap_person for $local_part@$domain"
   driver = accept
   condition = ${if eq {}{${lookup ldap{ \
-    user="$ldap_service_bind_dn" \
-    pass=$ldap_service_password \
-    ldap://$ldap_host:$ldap_port/$ldap_base_dn?mail?sub?LDAP_PERSON_QUERY} \
+    user="LDAP_SERVICE_BIND_DN" \
+    pass=LDAP_SERVICE_PASSWORD \
+    ldap://LDAP_HOST:LDAP_PORT/LDAP_BASE_DN?mail?sub?LDAP_PERSON_QUERY} \
     }}{no}{yes}}
   transport = people_transport
   cannot_route_message = Unknown user
diff -r afe204194ca2 -r 6c1808efb8c9 conf/exim/ldap/020_exim4-config_ldap_people_outgoing_recipients
--- a/conf/exim/ldap/020_exim4-config_ldap_people_outgoing_recipients	Tue Oct 27 19:21:21 2015 +0100
+++ b/conf/exim/ldap/020_exim4-config_ldap_people_outgoing_recipients	Tue Oct 27 21:16:26 2015 +0100
@@ -11,9 +11,9 @@
   condition = ${if and { \
     {eq {people-outgoing:}{${substr{0}{PEOPLE_OUTGOING}{${local_part}}}}} \
     {!eq {}{${lookup ldap{ \
-      user="$ldap_service_bind_dn" \
-      pass=$ldap_service_password \
-      ldap://$ldap_host:$ldap_port/$ldap_base_dn?mail?sub?LDAP_PERSON_OUTGOING_RECIPIENT_QUERY} \
+      user="LDAP_SERVICE_BIND_DN" \
+      pass=LDAP_SERVICE_PASSWORD \
+      ldap://LDAP_HOST:LDAP_PORT/LDAP_BASE_DN?mail?sub?LDAP_PERSON_OUTGOING_RECIPIENT_QUERY} \
       }}} \
     }}
   transport = people_outgoing_transport
diff -r afe204194ca2 -r 6c1808efb8c9 conf/exim/ldap/020_exim4-config_ldap_resources
--- a/conf/exim/ldap/020_exim4-config_ldap_resources	Tue Oct 27 19:21:21 2015 +0100
+++ b/conf/exim/ldap/020_exim4-config_ldap_resources	Tue Oct 27 21:16:26 2015 +0100
@@ -4,9 +4,9 @@
   debug_print = "R: ldap_resource for $local_part@$domain"
   driver = accept
   condition = ${if eq {}{${lookup ldap{ \
-    user="$ldap_service_bind_dn" \
-    pass=$ldap_service_password \
-    ldap://$ldap_host:$ldap_port/$ldap_base_dn?mail?sub?LDAP_RESOURCE_QUERY} \
+    user="LDAP_SERVICE_BIND_DN" \
+    pass=LDAP_SERVICE_PASSWORD \
+    ldap://LDAP_HOST:LDAP_PORT/LDAP_BASE_DN?mail?sub?LDAP_RESOURCE_QUERY} \
     }}{no}{yes}}
   transport = resources_transport
   cannot_route_message = Unknown user
diff -r afe204194ca2 -r 6c1808efb8c9 conf/postfix/ldap/virtual_alias_maps_people.cf
--- a/conf/postfix/ldap/virtual_alias_maps_people.cf	Tue Oct 27 19:21:21 2015 +0100
+++ b/conf/postfix/ldap/virtual_alias_maps_people.cf	Tue Oct 27 21:16:26 2015 +0100
@@ -1,11 +1,11 @@
-server_host = $ldap_host
-server_port = $ldap_port
+server_host = LDAP_HOST
+server_port = LDAP_PORT
 version = 3
-search_base = $ldap_base_dn
+search_base = LDAP_BASE_DN
 scope = sub
 
-bind_dn = $ldap_service_bind_dn
-bind_pw = $ldap_service_password
+bind_dn = LDAP_SERVICE_BIND_DN
+bind_pw = LDAP_SERVICE_PASSWORD
 
 query_filter = (&(|(mail=%s)(alias=%s))(objectclass=inetorgperson))
 result_attribute = mail
diff -r afe204194ca2 -r 6c1808efb8c9 conf/postfix/ldap/virtual_alias_maps_people_outgoing.cf
--- a/conf/postfix/ldap/virtual_alias_maps_people_outgoing.cf	Tue Oct 27 19:21:21 2015 +0100
+++ b/conf/postfix/ldap/virtual_alias_maps_people_outgoing.cf	Tue Oct 27 21:16:26 2015 +0100
@@ -1,11 +1,11 @@
-server_host = $ldap_host
-server_port = $ldap_port
+server_host = LDAP_HOST
+server_port = LDAP_PORT
 version = 3
-search_base = $ldap_base_dn
+search_base = LDAP_BASE_DN
 scope = sub
 
-bind_dn = $ldap_service_bind_dn
-bind_pw = $ldap_service_password
+bind_dn = LDAP_SERVICE_BIND_DN
+bind_pw = LDAP_SERVICE_PASSWORD
 
 query_filter = (&(|(mail=%s)(alias=%s))(objectclass=inetorgperson))
 result_attribute = mail
diff -r afe204194ca2 -r 6c1808efb8c9 conf/postfix/ldap/virtual_alias_maps_resources.cf
--- a/conf/postfix/ldap/virtual_alias_maps_resources.cf	Tue Oct 27 19:21:21 2015 +0100
+++ b/conf/postfix/ldap/virtual_alias_maps_resources.cf	Tue Oct 27 21:16:26 2015 +0100
@@ -1,11 +1,11 @@
-server_host = $ldap_host
-server_port = $ldap_port
+server_host = LDAP_HOST
+server_port = LDAP_PORT
 version = 3
-search_base = $ldap_base_dn
+search_base = LDAP_BASE_DN
 scope = sub
 
-bind_dn = $ldap_service_bind_dn
-bind_pw = $ldap_service_password
+bind_dn = LDAP_SERVICE_BIND_DN
+bind_pw = LDAP_SERVICE_PASSWORD
 
 query_filter = (&(|(mail=%s)(alias=%s))(&(!(objectclass=inetOrgPerson))(objectclass=mailRecipient)))
 result_attribute = mail