steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.59,1.60

cvs at intevation.de cvs at intevation.de
Mon Jul 25 03:29:56 CEST 2005


Author: steffen

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

Modified Files:
	Conf.pm 
Log Message:
imapd conf creation buglets fixed

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- Conf.pm	24 Jul 2005 21:47:41 -0000	1.59
+++ Conf.pm	25 Jul 2005 01:29:54 -0000	1.60
@@ -313,7 +313,7 @@
     my $cfg = "$ap::config->{imap_confdir}/cyrus.conf";
     my $oldcfg = $cfg . '.old';
     my $oldmask = umask 077;
-    copy($cfg, $oldcfg);
+    copy($cfg, $oldcfg) or Kolab::log('T', "Unable to back up configuration file `$cfg'", KOLAB_WARN);
     chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
     umask $oldmask;
 
@@ -663,8 +663,8 @@
 		 "$templatedir/master.cf.template" => "$ap::config->{sysconfdir}/postfix/master.cf",
 		 "$templatedir/saslauthd.conf.template" => "$ap::config->{sasl_confdir}/saslauthd.conf",
 		 "$templatedir/imapd.conf.template" => "$ap::config->{imap_confdir}/imapd.conf",
-		 "$templatedir/imapd.group.template" => "$ap::config->{imap_confdir}/imapd.group",
-		 "$templatedir/cyrus.conf.template" => "$ap::config->{imap_confdir}/cyrus.conf",
+#		 "$templatedir/imapd.group.template" => "$ap::config->{imap_confdir}/imapd.group",
+#		 "$templatedir/cyrus.conf.template" => "$ap::config->{imap_confdir}/cyrus.conf",
 		 "$templatedir/httpd.conf.template" => "$ap::config->{webserver_confdir}/apache.conf",
 		 "$templatedir/httpd.local.template" => "$ap::config->{webserver_confdir}/apache.local",
 		 "$templatedir/php.ini.template" => "$ap::config->{webserver_confdir}/php.ini",





More information about the commits mailing list