1.1 --- a/conf/exim/30_exim4-config_people Tue Oct 28 23:10:12 2014 +0100
1.2 +++ b/conf/exim/30_exim4-config_people Tue Oct 28 23:34:17 2014 +0100
1.3 @@ -1,6 +1,6 @@
1.4 people_transport:
1.5 debug_print = "T: people_transport for $local_part@$domain"
1.6 driver = pipe
1.7 - command = $imip_agent_dir/imip_person.py -l $lmtp_socket -o $pipe_addresses
1.8 - user = $system_user
1.9 - group = $lmtp_group
1.10 + command = /var/lib/imip-agent/imip_person.py -l $lmtp_socket -o $pipe_addresses
1.11 + user = imip-agent
1.12 + group = lmtp
2.1 --- a/conf/exim/30_exim4-config_resources Tue Oct 28 23:10:12 2014 +0100
2.2 +++ b/conf/exim/30_exim4-config_resources Tue Oct 28 23:34:17 2014 +0100
2.3 @@ -1,5 +1,5 @@
2.4 resources_transport:
2.5 debug_print = "T: resources_transport for $local_part@$domain"
2.6 driver = pipe
2.7 - command = $imip_agent_dir/imip_resource.py -o $pipe_addresses
2.8 - user = $system_user
2.9 + command = /var/lib/imip-agent/imip_resource.py -o $pipe_addresses
2.10 + user = imip-agent
3.1 --- a/conf/postfix/master.cf.items Tue Oct 28 23:10:12 2014 +0100
3.2 +++ b/conf/postfix/master.cf.items Tue Oct 28 23:34:17 2014 +0100
3.3 @@ -1,6 +1,6 @@
3.4 imip_resources unix - n n - - pipe
3.5 - flags=FR user=$user argv=$imip_agent_dir/imip_resource.py
3.6 + flags=FR user=imip-agent argv=/var/lib/imip-agent/imip_resource.py
3.7 -o ${original_recipient} -r ${recipient} -s imip-agent@example.com
3.8 imip_people unix - n n - - pipe
3.9 - flags=FR user=$user argv=$imip_agent_dir/imip_person.py
3.10 + flags=FR user=imip-agent argv=/var/lib/imip-agent/imip_person.py
3.11 -o ${original_recipient} -r ${recipient} -s imip-agent@example.com -l $lmtp_socket
4.1 --- a/conf/postfix/virtual_alias_maps_people.cf Tue Oct 28 23:10:12 2014 +0100
4.2 +++ b/conf/postfix/virtual_alias_maps_people.cf Tue Oct 28 23:34:17 2014 +0100
4.3 @@ -11,4 +11,4 @@
4.4
4.5 query_filter = (&(|(mail=%s)(alias=%s))(objectclass=kolabinetorgperson))
4.6 result_attribute = mail
4.7 -result_format = <$person_recipient+%s>
4.8 +result_format = <people+%s>
5.1 --- a/conf/postfix/virtual_alias_maps_resources.cf Tue Oct 28 23:10:12 2014 +0100
5.2 +++ b/conf/postfix/virtual_alias_maps_resources.cf Tue Oct 28 23:34:17 2014 +0100
5.3 @@ -10,5 +10,5 @@
5.4 bind_pw = $ldap_service_password
5.5
5.6 query_filter = (&(|(mail=%s)(alias=%s))(objectclass=kolabsharedfolder)(kolabFolderType=event))
5.7 -result_attribute = kolabtargetfolder
5.8 -result_format = <$resource_recipient+%s>
5.9 +result_attribute = mail
5.10 +result_format = <resources+%s>