gunnar: server/kolabconf/lib/Kolab Conf.pm,1.3,1.4

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv17255/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
Fixes for the splitted packages. Configuration values read via Kolab.pm should not be used in global scope. The release number should be set manually.

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Conf.pm	1 Aug 2007 14:31:35 -0000	1.3
+++ Conf.pm	2 Aug 2007 06:43:10 -0000	1.4
@@ -59,16 +59,6 @@
 
 our $VERSION = sprintf "%d.%03d", q$Revision$ =~ /(\d+)/g;
 
-my $templatedir = $Kolab::config{"templatedir"};
-
-my %special_templates = (
-			 "$templatedir/transport.template"      => 1,
-			 "$templatedir/virtual.template"        => 1,
-			 "$templatedir/imapd.group.template"    => 1,
-			 "$templatedir/cyrus.conf.template"     => 1,
-			 "$templatedir/slapd.access.template"   => 1,
-			 "$templatedir/slapd.replicas.template" => 1);
-
 my %templates = ();
 my %ownership = ();
 my %permissions = ();
@@ -102,6 +92,17 @@
     my $perm = shift;
     my $oldcfg = $cfg . '.old';
     
+    my $templatedir = $Kolab::config{"templatedir"};
+
+    my %special_templates = (
+	"$templatedir/transport.template"      => 1,
+	"$templatedir/virtual.template"        => 1,
+	"$templatedir/imapd.group.template"    => 1,
+	"$templatedir/cyrus.conf.template"     => 1,
+	"$templatedir/slapd.access.template"   => 1,
+	"$templatedir/slapd.replicas.template" => 1
+	);
+
     my $oldmask = umask 077;
     copy($cfg, $oldcfg);
     #chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
@@ -273,6 +274,8 @@
     my $map = shift;
     Kolab::log('T', "Building Postfix $map map", KOLAB_DEBUG);
 
+    my $templatedir = $Kolab::config{"templatedir"};
+
     my $keytemplate = "$templatedir/$map.template";
     my $cfg = $templates{$keytemplate};
     my $oldcfg = $cfg . '.old';
@@ -346,6 +349,8 @@
 {
     Kolab::log('T', 'Building Cyrus config', KOLAB_DEBUG);
 
+    my $templatedir = $Kolab::config{"templatedir"};
+
     my $keytemplate = "$templatedir/cyrus.conf.template";
     my $cfg = $templates{$keytemplate};
     my $imapdtemplate = "$templatedir/imapd.conf.template";
@@ -425,6 +430,8 @@
 {
     Kolab::log('T', 'Building Cyrus groups', KOLAB_DEBUG);
 
+    my $templatedir = $Kolab::config{"templatedir"};
+
     my $keytemplate = "$templatedir/imapd.group.template";
     my $cfg = $templates{$keytemplate};
     my $oldcfg = $cfg . '.old';
@@ -497,6 +504,9 @@
 sub buildLDAPAccess
 {
     Kolab::log('T', 'Building LDAP access file', KOLAB_DEBUG);
+
+    my $templatedir = $Kolab::config{"templatedir"};
+
     my $keytemplate = "$templatedir/slapd.access.template";
     my $cfg = $templates{$keytemplate};
     my $oldcfg = $cfg . '.old';
@@ -588,6 +598,8 @@
 {
     Kolab::log('T', 'Building LDAP replicas', KOLAB_DEBUG);
 
+    my $templatedir = $Kolab::config{"templatedir"};
+
     my $keytemplate = "$templatedir/slapd.replicas.template";
     my $cfg = $templates{$keytemplate};
     my $oldcfg = $cfg . '.old';
@@ -709,6 +721,7 @@
     my $section="";
     my %runonchange;
 
+    my $templatedir = $Kolab::config{"templatedir"};
 
     Kolab::log('T', 'Regenerating configuration files', KOLAB_DEBUG );
 
@@ -745,6 +758,8 @@
     my $key;
     my $value;
 
+    my $templatedir = $Kolab::config{"templatedir"};
+
     Kolab::log('T', 'Checking generated config file permissions and ownership', KOLAB_DEBUG );
 
     loadMetaTemplates( $templatedir, \%templates, \%permissions, \%ownership );
@@ -778,38 +793,38 @@
 sub reload
 {
     if ($haschanged{'slapd'}) {
-        &log('K', 'Restarting OpenLDAP...');
+        &Kolab::log('K', 'Restarting OpenLDAP...');
         system("$Kolab::config{'KOLABRC'} rc openldap restart &");
     }
 
     if ($haschanged{'saslauthd'}) {
-        &log('K', 'Restarting SASLAuthd...');
+        &Kolab::log('K', 'Restarting SASLAuthd...');
         system("$Kolab::config{'KOLABRC'} rc sasl stop; sleep 1; $Kolab::config{sbindir}/saslauthd -a ldap -n 5");
     }
 
     if ($haschanged{'apache'}) {
-        &log('K', 'Reloading Apache...');
+        &Kolab::log('K', 'Reloading Apache...');
         system("$Kolab::config{sbindir}/apachectl graceful");
     }
 
     if ($haschanged{'postfix'}) {
-        &log('K', 'Reloading Postfix...');
+        &Kolab::log('K', 'Reloading Postfix...');
         system("$Kolab::config{sbindir}/postfix reload");
     }
 
     if ($haschanged{'imapd'}) {
-        &log('K', 'Restarting imapd...');
+        &Kolab::log('K', 'Restarting imapd...');
 	# Would it be enough with a reload here? /steffen
         system("$Kolab::config{'KOLABRC'} rc imapd restart");
     }
 
     if ($haschanged{'amavisd'}) {
-        &log('K', 'Restarting amavisd...');
+        &Kolab::log('K', 'Restarting amavisd...');
         system("$Kolab::config{'KOLABRC'} rc amavisd restart");
     }
 
     if ($haschanged{'clamav'}) {
-        &log('K', 'Restarting clamav...');
+        &Kolab::log('K', 'Restarting clamav...');
         system("$Kolab::config{'KOLABRC'} rc clamav restart");
     }
 
@@ -817,17 +832,17 @@
         Kolab::log('K', 'Starting ProFTPd if not running');
         system("$Kolab::config{'KOLABRC'} rc proftpd start");
         if ($haschanged{'proftpd'}) {
-            &log('K', 'Reloading ProFTPd...');
+            &Kolab::log('K', 'Reloading ProFTPd...');
             kill('SIGHUP', `cat $Kolab::config{ftpserver_pidfile}`);
         }
     } else {
-        &log('K', 'Stopping ProFTPd, if running...');
+        &Kolab::log('K', 'Stopping ProFTPd, if running...');
         system("$Kolab::config{'KOLABRC'} rc proftpd stop");
     }
 
     %Kolab::Conf::haschanged = ();
 
-    &log('K', 'Reload finished');
+    &Kolab::log('K', 'Reload finished');
 }
 
 1;