thomas: server/kolabd/kolabd/dist_conf centos-clarkconnect, 1.6, 1.7 common, 1.38, 1.39 debian, 1.11, 1.12 gentoo, 1.11, 1.12 kolab, 1.49, 1.50 mandriva, 1.8, 1.9 suse, 1.60, 1.61

Wed Oct 17 19:57:15 CEST 2007

Author: thomas

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

Modified Files:
	centos-clarkconnect common debian gentoo kolab mandriva suse 
Log Message:
Fix kolab/issue934 (Remove FTP FreeBusy Service (proftpd))


Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7

--- centos-clarkconnect	31 Aug 2007 10:52:43 -0000	1.6
+++ centos-clarkconnect	17 Oct 2007 17:57:13 -0000	1.7
@@ -110,21 +110,6 @@
 emailserver_musr=is_this_still_used
 
 #--------------------------------------------------------------------
-# Proftp
-#--------------------------------------------------------------------
-# TODO
-
-ftpserver_scoreboardfile=/var/state/score
-ftpserver_logfile=/var/log/xferlog
-ftpserver_confdir=/etc
-ftpserver_pidfile=/var/run/proftpd.pid
-ftpserver_musr=root
-ftpserver_usr=ftp
-ftpserver_grp=ftp
-ftpserver_uid=14
-ftpserver_gid=50
-
-#--------------------------------------------------------------------
 # Cyrus IMAP
 #--------------------------------------------------------------------
 # TODO: is imap_lmtp still used?

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- common	31 Aug 2007 10:52:43 -0000	1.38
+++ common	17 Oct 2007 17:57:13 -0000	1.39
@@ -63,15 +63,6 @@
 	-e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
 	-e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
 	-e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
-	-e 's,[@]ftpserver_confdir[@],$(ftpserver_confdir),g' \
-	-e 's,[@]ftpserver_gid[@],$(ftpserver_gid),g' \
-	-e 's,[@]ftpserver_grp[@],$(ftpserver_grp),g' \
-	-e 's,[@]ftpserver_logfile[@],$(ftpserver_logfile),g' \
-	-e 's,[@]ftpserver_musr[@],$(ftpserver_musr),g' \
-	-e 's,[@]ftpserver_pidfile[@],$(ftpserver_pidfile),g' \
-	-e 's,[@]ftpserver_scoreboardfile[@],$(ftpserver_scoreboardfile),g' \
-	-e 's,[@]ftpserver_uid[@],$(ftpserver_uid),g' \
-	-e 's,[@]ftpserver_usr[@],$(ftpserver_usr),g' \
 	-e 's,[@]graveyard_tscache[@],$(graveyard_tscache),g' \
 	-e 's,[@]graveyard_uidcache[@],$(graveyard_uidcache),g' \
 	-e 's,[@]imap_confdir[@],$(imap_confdir),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- debian	31 Aug 2007 10:52:43 -0000	1.11
+++ debian	17 Oct 2007 17:57:13 -0000	1.12
@@ -57,17 +57,6 @@
 emailserver_musr=kolab
 emailserver_grp=${restricted_kolab_grp}
 
-ftpserver_scoreboardfile=${localstatedir}/proftpd/score
-ftpserver_logfile=${localstatedir}/log/proftpd.log
-ftpserver_confdir=${sysconfdir}/proftpd
-ftpserver_pidfile=${sysrundir}/proftpd/proftpd.pid
-ftpserver_musr=kolab
-ftpserver_usr=${kolab_usr}
-ftpserver_grp=${kolab_grp}
-# Why hardcoded uid/gid???
-ftpserver_uid=19416
-ftpserver_gid=19416
-
 imap_confdir=${sysconfdir}
 imap_confperm=0640
 imap_usr=cyrus

Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gentoo	31 Aug 2007 10:52:43 -0000	1.11
+++ gentoo	17 Oct 2007 17:57:13 -0000	1.12
@@ -149,27 +149,6 @@
 imap_notify_socket=${imap_statedir}/socket/notify
 
 #####################################################################
-# Proftpd parameters
-
-### -> users
-
-ftpserver_musr=kolab
-ftpserver_usr=nobody
-ftpserver_grp=nobody
-# Why hardcoded uid/gid???
-ftpserver_uid=65534
-ftpserver_gid=65534
-
-### -> files
-
-ftpserver_scoreboardfile=${sysrundir}/proftpd/score
-ftpserver_logfile=${logdir}/proftpd.log
-ftpserver_confdir=${sysconfdir}/proftpd
-ftpserver_pidfile=${sysrundir}/proftpd/proftpd.pid
-
-#--------------------------------------------------------------------
-
-#####################################################################
 # LDAP parameters
 
 ### -> users

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- kolab	14 Oct 2007 12:31:58 -0000	1.49
+++ kolab	17 Oct 2007 17:57:13 -0000	1.50
@@ -76,17 +76,6 @@
 emailserver_rpm=postfix
 emailserver_tables_usr=${kolab_susr}
 
-ftpserver_scoreboardfile=${localstatedir}/proftpd/score
-ftpserver_logfile=${localstatedir}/proftpd/proftpd.log
-ftpserver_confdir=${sysconfdir}/proftpd
-ftpserver_pidfile=${localstatedir}/proftpd/proftpd.pid
-ftpserver_musr=${kolab_musr}
-ftpserver_usr=${kolab_usr}
-ftpserver_grp=${kolab_grp}
-# Why hardcoded uid/gid???
-ftpserver_uid=19416
-ftpserver_gid=19416
-
 imap_confdir=${sysconfdir}/imapd
 imap_confperm=0640
 # @l_musr@

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mandriva	27 Jul 2007 18:25:20 -0000	1.8
+++ mandriva	17 Oct 2007 17:57:13 -0000	1.9
@@ -35,15 +35,6 @@
 emailserver_grp=${restricted_kolab_grp}
 emailserver_mail_usr=kolab              # = kolab
 
-ftpserver_scoreboardfile=/var/run/proftpd/proftpd.scoreboard
-ftpserver_logfile=/var/log/proftpd/proftpd.log
-ftpserver_pidfile=/var/run/proftpd.pid
-ftpserver_confdir=${sysconfdir}
-ftpserver_usr=nobody
-ftpserver_grp=nogroup
-ftpserver_uid=65534
-ftpserver_gid=65534
-
 kolab_logdir=/var/log/kolab
 kolab_pidfile=/var/run/kolab/kolab.pid
 kolab_scriptsdir=$(sysconfdir)/kolab

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- suse	31 Aug 2007 10:52:43 -0000	1.60
+++ suse	17 Oct 2007 17:57:13 -0000	1.61
@@ -66,17 +66,6 @@
 emailserver_rpm=postfix
 emailserver_tables_usr=root
 
-ftpserver_scoreboardfile=${localstatedir}/proftpd/score
-ftpserver_logfile=${localstatedir}/log/proftpd.log
-ftpserver_confdir=${sysconfdir}/proftpd
-ftpserver_pidfile=${localstatedir}/proftpd/proftpd.pid
-ftpserver_musr=kolab
-ftpserver_usr=${kolab_usr}
-ftpserver_grp=${kolab_grp}
-# Why hardcoded uid/gid???
-ftpserver_uid=19416
-ftpserver_gid=19416
-
 imap_confdir=${sysconfdir}
 imap_confperm=0640
 imap_usr=cyrus



