thomas: server/perl-kolab/lib/Kolab Conf.pm,1.9,1.10

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv5785/perl-kolab/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
Use RUNONCHANGE mechanism to restart or reload imapd:

cyrus.conf.template: openpkg rc imapd reload (see man cyrmaster)
imapd.conf.template: openpkg rc imapd restart (reload and reconnect was not
 enough when I tested changing unixhierarchysep and annotation_definitions)
imapd.annotation_definitions.template: openpkg rc imapd restart (reload and
 reconnect was not enough)
imapd.group.template: nothing (a simple reconnect was enough, this is the old
 behaviour and changing this to restart to force new permissions would be
 overkill since then all users would be disconnected)


Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Conf.pm	5 May 2009 13:05:49 -0000	1.9
+++ Conf.pm	7 May 2009 16:13:33 -0000	1.10
@@ -288,8 +288,6 @@
         if ($rc) {
             if ($cfg =~ /openldap/) {
                 $haschanged{'slapd'} = 1;
-            } elsif ($cfg =~ /imapd/) {
-                $haschanged{'imapd'} = 1;
             }
             $templatehaschanged{$tmpl} = 1;
 
@@ -812,12 +810,6 @@
     if ($haschanged{'slapd'}) {
         &Kolab::log('K', 'Restarting OpenLDAP...');
         system("$Kolab::config{'KOLABRC'} rc openldap restart &");
-    }
-
-    if ($haschanged{'imapd'}) {
-        &Kolab::log('K', 'Restarting imapd...');
-	# Would it be enough with a reload here? /steffen
-        system("$Kolab::config{'KOLABRC'} rc imapd restart");
     }
 
     %Kolab::Conf::haschanged = ();