thomas: server/perl-kolab/lib/Kolab Conf.pm,1.5,1.6
cvs at kolab.org
cvs at kolab.org
Tue Mar 17 14:15:18 CET 2009
- Previous message: thomas: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.13, 1.14 clamd.conf.template.in, 1.3, 1.4 httpd.conf.template.in, 1.28, 1.29 httpd.local.template.in, 1.3, 1.4 php.ini.template.in, 1.7, 1.8
- Next message: thomas: server/perl-kolab ChangeLog,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thomas
Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv4180/perl-kolab/lib/Kolab
Modified Files:
Conf.pm
Log Message:
Use RUNONCHANGE mechanism to restart or reload apache, amavisd and clamav.
This finishes the transition of all easy targets to RUNONCHANGE as mentioned in
kolab/issue1679 ([kolabconf] Update template META mechanism to support service
restarts)
Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Conf.pm 17 Mar 2009 11:20:57 -0000 1.5
+++ Conf.pm 17 Mar 2009 13:15:16 -0000 1.6
@@ -291,21 +291,12 @@
if ($rc) {
if ($cfg =~ /postfix/) {
$haschanged{'postfix'} = 1;
- } elsif ($cfg =~ /apache/) {
- $haschanged{'apache'} = 1;
} elsif ($cfg =~ /openldap/) {
$haschanged{'slapd'} = 1;
} elsif ($cfg =~ /imapd/) {
$haschanged{'imapd'} = 1;
- } elsif ($cfg =~ /amavisd/) {
- $haschanged{'amavisd'} = 1;
- } elsif ($cfg =~ /clamav/) {
- $haschanged{'clamav'} = 1;
-#} elsif ($cfg =~ /example/) {
- } else {
- Kolab::log('T', "`$cfg' change detected ", KOLAB_DEBUG );
- }
- $templatehaschanged{$tmpl} = 1;
+ }
+ $templatehaschanged{$tmpl} = 1;
Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG );
}
@@ -844,11 +835,6 @@
system("$Kolab::config{'KOLABRC'} rc openldap restart &");
}
- if ($haschanged{'apache'}) {
- &Kolab::log('K', 'Reloading Apache...');
- system("$Kolab::config{sbindir}/apachectl graceful");
- }
-
if ($haschanged{'postfix'}) {
&Kolab::log('K', 'Reloading Postfix...');
system("$Kolab::config{sbindir}/postfix reload");
@@ -858,16 +844,6 @@
&Kolab::log('K', 'Restarting imapd...');
# Would it be enough with a reload here? /steffen
system("$Kolab::config{'KOLABRC'} rc imapd restart");
- }
-
- if ($haschanged{'amavisd'}) {
- &Kolab::log('K', 'Restarting amavisd...');
- system("$Kolab::config{'KOLABRC'} rc amavisd restart");
- }
-
- if ($haschanged{'clamav'}) {
- &Kolab::log('K', 'Restarting clamav...');
- system("$Kolab::config{'KOLABRC'} rc clamav restart");
}
%Kolab::Conf::haschanged = ();
- Previous message: thomas: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.13, 1.14 clamd.conf.template.in, 1.3, 1.4 httpd.conf.template.in, 1.28, 1.29 httpd.local.template.in, 1.3, 1.4 php.ini.template.in, 1.7, 1.8
- Next message: thomas: server/perl-kolab ChangeLog,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list