Branch '2.2-stable' - 2 commits - kolabd/kolabd

[Jeroen van Meeuwen]

 kolabd/kolabd/dist_conf/kolabctl |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit c7fc1ade9e00d8b4d503cc0fad5b132feab91cb1
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Jan 6 16:21:59 2011 +0000

    Add the kolab services and add service provider hosted-kolabd for our hosted environments

diff --git a/kolabd/kolabd/dist_conf/kolabctl b/kolabd/kolabd/dist_conf/kolabctl
index 1b4db99..0d4f953 100644
--- a/kolabd/kolabd/dist_conf/kolabctl
+++ b/kolabd/kolabd/dist_conf/kolabctl
@@ -67,6 +67,9 @@ services[${#services[@]}]=antivirus;    service_providers[${#service_providers[@
 services[${#services[@]}]=antivirus;    service_providers[${#service_providers[@]}]=freshclam
 services[${#services[@]}]=antivirus;    service_providers[${#service_providers[@]}]=clamav-freshclam
 
+services[${#services[@]}]=kolab;        service_providers[${#service_providers[@]}]=kolabd
+services[${#services[@]}]=kolab;        service_providers[${#service_providers[@]}]=hosted-kolabd
+
 service_num=0
 
 while [ ${service_num} -lt ${#services[@]} ]; do


commit a1e8c65be0e7a8fe6d828d64664d3e22f7459acd
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Jan 6 16:19:56 2011 +0000

    Add slapd as it appears to be the service name on Debian Lenny

diff --git a/kolabd/kolabd/dist_conf/kolabctl b/kolabd/kolabd/dist_conf/kolabctl
index 069236f..1b4db99 100644
--- a/kolabd/kolabd/dist_conf/kolabctl
+++ b/kolabd/kolabd/dist_conf/kolabctl
@@ -39,6 +39,7 @@ declare -a services
 declare -a service_providers
 
 services[${#services[@]}]=ldap;         service_providers[${#service_providers[@]}]=ldap
+services[${#services[@]}]=ldap;         service_providers[${#service_providers[@]}]=slapd
 services[${#services[@]}]=ldap;         service_providers[${#service_providers[@]}]=dirsrv
 
 services[${#services[@]}]=mta;          service_providers[${#service_providers[@]}]=sendmail