gunnar: server/kolabd/kolabd ChangeLog, 1.105, 1.106 kolab.globals.in, 1.1, 1.2 kolab_upgrade.in, 1.3, 1.4 kolabcheckperm.in, 1.2, 1.3 kolabconf.in, 1.2, 1.3 kolabd.in, 1.5, 1.6 kolabquotareport.in, 1.1, 1.2 kolabquotawarn.in, 1.11, 1.12
cvs at kolab.org
cvs at kolab.org
Tue Jul 31 13:54:35 CEST 2007
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv26549/kolabd/kolabd
Modified Files:
ChangeLog kolab.globals.in kolab_upgrade.in kolabcheckperm.in
kolabconf.in kolabd.in kolabquotareport.in kolabquotawarn.in
Log Message:
Removed knowledge of the kolabd package from the Kolab.pm script.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- ChangeLog 27 Jul 2007 20:28:31 -0000 1.105
+++ ChangeLog 31 Jul 2007 11:54:33 -0000 1.106
@@ -1,3 +1,20 @@
+2007-07-31 Gunnar Wrobel <p at rdus.de>
+
+ * kolab.globals.in (kolab_locals):
+
+ Instead of rewriting variables within the perl-kolab library these
+ are now provided within kolab.globals.
+
+ * kolabcheckperm.in (Kolab):
+ * kolab_upgrade.in (Kolab):
+ * kolabquotawarn.in (Kolab):
+ * kolabquotareport.in (Kolab):
+ * kolabconf.in (Kolab):
+ * kolabd.in (Kolab):
+
+ Fixed reloadConfig call to contain the path to the global
+ configuration file.
+
2007-07-27 Gunnar Wrobel <p at rdus.de>
* kolabquotareport.in:
@@ -7,7 +24,7 @@
Added statedir variable to the LDAP startup call.
- * Makefile.am (kolabquotareport):
+ * Makefile.am (kolabquotareport):
Made kolabquotareport a rewritten file (kolabquotareport.in)
The file does not get installed though.
Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.globals.in 27 Jul 2007 18:25:20 -0000 1.1
+++ kolab.globals.in 31 Jul 2007 11:54:33 -0000 1.2
@@ -34,3 +34,11 @@
maildefer_listen: 127.0.0.1:10024
maildefer_talk: 127.0.0.1:10025
kolabconf_script: @kolabconf_script@
+kolab_locals: @sysconfdir@/kolab/kolab.conf
+kolab_usr: @kolab_usr@
+kolab_grp: @kolab_grp@
+kolab_rusr: @kolab_rusr@
+kolab_rgrp: @kolab_rgrp@
+kolab_musr: @kolab_musr@
+kolab_mgrp: @kolab_mgrp@
+hashmethod: @sbindir@/slappasswd -s
Index: kolab_upgrade.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_upgrade.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab_upgrade.in 27 Jul 2007 20:28:31 -0000 1.3
+++ kolab_upgrade.in 31 Jul 2007 11:54:33 -0000 1.4
@@ -7,6 +7,9 @@
use Term::ReadKey;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::LDAP;
Index: kolabcheckperm.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabcheckperm.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabcheckperm.in 27 Nov 2005 23:57:02 -0000 1.2
+++ kolabcheckperm.in 31 Jul 2007 11:54:33 -0000 1.3
@@ -9,6 +9,9 @@
use strict;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::Conf;
Index: kolabconf.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabconf.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabconf.in 27 Nov 2005 23:57:02 -0000 1.2
+++ kolabconf.in 31 Jul 2007 11:54:33 -0000 1.3
@@ -32,6 +32,9 @@
use Sys::Syslog;
use IO::File;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::Conf;
use Kolab::LDAP;
@@ -89,7 +92,7 @@
Kolab::Conf::rebuildTemplates;
Kolab::log('KC', 'Reloading kolab components');
if( $do_reload ) {
- Kolab::reload;
+ Kolab::Conf::reload;
}
#if ($pid) {
# Kolab::log('KC', "Refreshing the kolab daemon (w/ PID $pid)");
Index: kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabd.in 27 Jul 2007 20:28:31 -0000 1.5
+++ kolabd.in 31 Jul 2007 11:54:33 -0000 1.6
@@ -42,6 +42,9 @@
use Sys::Syslog;
use IO::File;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::LDAP;
use Kolab::LDAP::Backend;
@@ -82,7 +85,7 @@
waitpid($pid, 0);
}
%pids = ();
- Kolab::reloadConfig;
+ Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
Kolab::log('K', 'Synchronising');
Kolab::LDAP::sync;
Kolab::log('K', 'Reloading addressbook.peers');
Index: kolabquotareport.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotareport.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolabquotareport.in 27 Jul 2007 20:28:31 -0000 1.1
+++ kolabquotareport.in 31 Jul 2007 11:54:33 -0000 1.2
@@ -35,6 +35,9 @@
use Mail::Message;
use Cyrus::IMAP::Admin;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::LDAP;
use vars qw($opt_d);
Index: kolabquotawarn.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolabquotawarn.in 27 Jul 2007 20:28:31 -0000 1.11
+++ kolabquotawarn.in 31 Jul 2007 11:54:33 -0000 1.12
@@ -37,6 +37,9 @@
use Mail::Transport::SMTP;
use Cyrus::IMAP::Admin;
use Kolab;
+
+Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
+
use Kolab::Util;
use Kolab::LDAP;
use File::Basename;
More information about the commits
mailing list