steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.21,1.22

cvs at intevation.de cvs at intevation.de
Mon Jun 21 05:20:38 CEST 2004


Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv23307/perl-kolab/Kolab-Conf

Modified Files:
	Conf.pm 
Log Message:
fixes and cleanup

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Conf.pm	21 Jun 2004 01:46:40 -0000	1.21
+++ Conf.pm	21 Jun 2004 03:20:36 -0000	1.22
@@ -89,7 +89,7 @@
     chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
     #chmod(0600, $oldcfg) if ($oldcfg =~ /openldap/);
 
-    Kolab::log('T', "Creating new configuration file `$cfg' from template `$tmpl'");
+    Kolab::log('T', "Creating new configuration file `$cfg' from template `$tmpl'", KOLAB_DEBUG );
     #print STDERR "Creating new configuration file `$cfg' from template `$tmpl'\n";
 
     my $template;
@@ -107,7 +107,7 @@
         exit(1);
     }
 
-    Kolab::log('T', "Using temporary file '".$config->filename."'");
+    Kolab::log('T', "Using temporary file '".$config->filename."'", KOLAB_DEBUG );
 
     my $skip = 0;
     while (<$template>) {
@@ -176,16 +176,16 @@
                 $Kolab::haschanged{'clamav'} = 1;
 	    }
 
-            Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG);
+            Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG );
         }
     }
 
-    Kolab::log('T', "Finished creating configuration file `$cfg'");
+    Kolab::log('T', "Finished creating configuration file `$cfg'", KOLAB_DEBUG );
 }
 
 sub buildPostfixTransportMap
 {
-    Kolab::log('T', 'Building Postfix transport map');
+    Kolab::log('T', 'Building Postfix transport map', KOLAB_DEBUG);
 
     my $prefix = $Kolab::config{'prefix'};
     my $cfg = "$prefix/etc/postfix/transport";
@@ -284,12 +284,12 @@
         $Kolab::haschanged{'postfix'} = 1;
     }
 
-    Kolab::log('T', 'Finished building Postfix transport map');
+    Kolab::log('T', 'Finished building Postfix transport map', KOLAB_DEBUG);
 }
 
 sub buildCyrusConfig
 {
-    Kolab::log('T', 'Building Cyrus config');
+    Kolab::log('T', 'Building Cyrus config', KOLAB_DEBUG);
 
     my $prefix = $Kolab::config{'prefix'};
     my $cyrustemplate;
@@ -345,12 +345,12 @@
         $Kolab::haschanged{'imapd'} = 1;
     }
 
-    Kolab::log('T', 'Finished building Cyrus config');
+    Kolab::log('T', 'Finished building Cyrus config', KOLAB_DEBUG);
 }
 
 sub buildCyrusGroups
 {
-    Kolab::log('T', 'Building Cyrus groups');
+    Kolab::log('T', 'Building Cyrus groups', KOLAB_DEBUG);
 
     my $prefix = $Kolab::config{'prefix'};
     my $cfg = "$prefix/etc/imapd/imapd.group";
@@ -421,12 +421,12 @@
         $Kolab::haschanged{'imapd'} = 1;
     }
 
-    Kolab::log('T', 'Finished building Cyrus groups');
+    Kolab::log('T', 'Finished building Cyrus groups', KOLAB_DEBUG );
 }
 
 sub buildLDAPReplicas
 {
-    Kolab::log('T', 'Building LDAP replicas');
+    Kolab::log('T', 'Building LDAP replicas', KOLAB_DEBUG);
 
     my $prefix = $Kolab::config{'prefix'};
     my $cfg = "$prefix/etc/openldap/slapd.replicas";
@@ -468,7 +468,7 @@
         $Kolab::haschanged{'slapd'} = 1;
     }
 
-    Kolab::log('T', 'Finished building LDAP replicas');
+    Kolab::log('T', 'Finished building LDAP replicas', KOLAB_DEBUG);
 }
 
 sub rebuildTemplates
@@ -545,7 +545,7 @@
       "$prefix/etc/imapd/imapd.group"                        => "kolab:kolab-r");
 
 
-    Kolab::log('T', 'Regenerating configuration files');
+    Kolab::log('T', 'Regenerating configuration files', KOLAB_DEBUG );
 
     foreach $key (keys %templates) {
       my $tpl = $templates{$key};
@@ -557,7 +557,7 @@
     buildCyrusConfig;
     buildCyrusGroups;
 
-    Kolab::log('T', 'Finished regenerating configuration files');
+    Kolab::log('T', 'Finished regenerating configuration files', KOLAB_DEBUG );
 }
 
 1;





More information about the commits mailing list