thomas: server/kolabconf/lib/Kolab Conf.pm,1.11,1.12
cvs at kolab.org
cvs at kolab.org
Wed Oct 17 19:57:15 CEST 2007
- Previous message: thomas: server/kolab-webadmin/admin/templates kolab.tpl,1.1,1.2
- Next message: 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thomas
Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv9800/kolabconf/lib/Kolab
Modified Files:
Conf.pm
Log Message:
Fix kolab/issue934 (Remove FTP FreeBusy Service (proftpd))
Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Conf.pm 14 Oct 2007 12:31:58 -0000 1.11
+++ Conf.pm 17 Oct 2007 17:57:13 -0000 1.12
@@ -232,8 +232,6 @@
$haschanged{'saslauthd'} = 1;
} elsif ($cfg =~ /apache/) {
$haschanged{'apache'} = 1;
- } elsif ($cfg =~ /proftpd/) {
- $haschanged{'proftpd'} = 1;
} elsif ($cfg =~ /openldap/) {
$haschanged{'slapd'} = 1;
} elsif ($cfg =~ /imapd/) {
@@ -758,18 +756,6 @@
if ($haschanged{'clamav'}) {
&Kolab::log('K', 'Restarting clamav...');
system("$Kolab::config{'KOLABRC'} rc clamav restart");
- }
-
- if ($Kolab::config{'proftpd-ftp'} =~ /true/i) {
- Kolab::log('K', 'Starting ProFTPd if not running');
- system("$Kolab::config{'KOLABRC'} rc proftpd start");
- if ($haschanged{'proftpd'}) {
- &Kolab::log('K', 'Reloading ProFTPd...');
- kill('SIGHUP', `cat $Kolab::config{ftpserver_pidfile}`);
- }
- } else {
- &Kolab::log('K', 'Stopping ProFTPd, if running...');
- system("$Kolab::config{'KOLABRC'} rc proftpd stop");
}
%Kolab::Conf::haschanged = ();
- Previous message: thomas: server/kolab-webadmin/admin/templates kolab.tpl,1.1,1.2
- Next message: 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list