thomas: server/kolabd/kolabd/templates rc.conf.template.in, 1.4, 1.5 proftpd.conf.template.in, 1.2, NONE

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv9800/kolabd/kolabd/templates

Modified Files:
	rc.conf.template.in 
Removed Files:
	proftpd.conf.template.in 
Log Message:
Fix kolab/issue934 (Remove FTP FreeBusy Service (proftpd))


Index: rc.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/rc.conf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rc.conf.template.in	8 Oct 2007 15:39:27 -0000	1.4
+++ rc.conf.template.in	17 Oct 2007 17:57:13 -0000	1.5
@@ -14,11 +14,5 @@
 openldap_url="ldap://@@@bind_addr@@@/ ldaps://@@@bind_addr@@@/"
 sasl_authmech="ldap"
 
-@@@if proftpd-ftp@@@
-proftpd_enable="yes"
-@@@else@@@
-proftpd_enable="no"
-@@@endif@@@
-
 spamassassin_enable="no"
 clamav_update="hourly"

--- proftpd.conf.template.in DELETED ---