Index: kolabd/ChangeLog =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v retrieving revision 1.3 diff -a -u -r1.3 ChangeLog --- kolabd/ChangeLog 27 Nov 2005 11:58:41 -0000 1.3 +++ kolabd/ChangeLog 27 Nov 2005 20:32:54 -0000 @@ -1,3 +1,21 @@ +2005-11-27 Marcus Hüwe + * dist_conf/common: altered bash_exec, perl_exec to respectively: + BASH and PERL. + Added: PHP, freebusy_cachefile and resmgr_filter in preparation for + the autoconfiscation patch to the kolab-resource-handlers module + * dist_conf/kolab: reflected changes made in dist_conf/common + * kolab.in: reflected changes made in dist_conf/common + * kolab_bootstrap.in: reflected changes made in dist_conf/common + * kolab_ca.sh.in: reflected changes made in dist_conf/common + * kolab_smtpdpolicy.in: reflected changes made in dist_conf/common + * kolab_upgrade.in: reflected changes made in dist_conf/common + * kolabcheckperm.in: reflected changes made in dist_conf/common + * kolabconf.in: reflected changes made in dist_conf/common + * kolabd.in: reflected changes made in dist_conf/common + * kolabpasswd.in: reflected changes made in dist_conf/common + * kolabquotawarn.in: reflected changes made in dist_conf/common + * namespace/kolab.in: reflected changes made in dist_conf/common + 2005-11-22 Richard Bos * dist_conf/common: Added phplibdir2 to the sed command * dist_conf/kolab: use the variable kolabstatedir in the Index: kolabd/kolab.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab.in,v retrieving revision 1.1 diff -a -u -r1.1 kolab.in --- kolabd/kolab.in 13 Sep 2005 14:38:22 -0000 1.1 +++ kolabd/kolab.in 27 Nov 2005 20:32:54 -0000 @@ -1,4 +1,4 @@ -#!@perl_exec@ +#!@PERL@ ## ## Copyright (c) 2003 Code Fusion cc Index: kolabd/kolab_bootstrap.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v retrieving revision 1.7 diff -a -u -r1.7 kolab_bootstrap.in --- kolabd/kolab_bootstrap.in 22 Nov 2005 14:21:58 -0000 1.7 +++ kolabd/kolab_bootstrap.in 27 Nov 2005 20:32:55 -0000 @@ -1,4 +1,4 @@ -#!@perl_exec@ +#!@PERL@ # (c) 2004-2005 Steffen Hansen # (c) 2003,2004 Tassilo Erlewein Index: kolabd/kolab_ca.sh.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_ca.sh.in,v retrieving revision 1.1 diff -a -u -r1.1 kolab_ca.sh.in --- kolabd/kolab_ca.sh.in 13 Sep 2005 14:38:22 -0000 1.1 +++ kolabd/kolab_ca.sh.in 27 Nov 2005 20:32:55 -0000 @@ -1,4 +1,4 @@ -#!@bash_exec@ +#!@BASH@ ## ## Copyright (c) 2004 Klaraelvdalens Datakonsult AB ## Written by Steffen Hansen Index: kolabd/kolab_smtpdpolicy.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_smtpdpolicy.in,v retrieving revision 1.4 diff -a -u -r1.4 kolab_smtpdpolicy.in --- kolabd/kolab_smtpdpolicy.in 18 Oct 2005 12:24:13 -0000 1.4 +++ kolabd/kolab_smtpdpolicy.in 27 Nov 2005 20:32:55 -0000 @@ -1,4 +1,4 @@ -#!@perl_exec@ +#!@PERL@ ## ## Copyright (c) 2004 Klaraelvdalens Datakonsult AB Index: kolabd/kolab_upgrade.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolab_upgrade.in,v retrieving revision 1.1 diff -a -u -r1.1 kolab_upgrade.in --- kolabd/kolab_upgrade.in 20 Oct 2005 11:41:41 -0000 1.1 +++ kolabd/kolab_upgrade.in 27 Nov 2005 20:32:55 -0000 @@ -1,4 +1,4 @@ -#!@perl_exec@ -w +#!@PERL@ -w # (c) 2005 Steffen Hansen # Index: kolabd/kolabcheckperm.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabcheckperm.in,v retrieving revision 1.1 diff -a -u -r1.1 kolabcheckperm.in --- kolabd/kolabcheckperm.in 13 Sep 2005 14:38:22 -0000 1.1 +++ kolabd/kolabcheckperm.in 27 Nov 2005 20:32:55 -0000 @@ -1,4 +1,4 @@ -#!@perl_exec@ +#!@PERL@ # (c) 2004 Klaralvdalens Datakonsult AB # Index: kolabd/kolabconf.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabconf.in,v retrieving revision 1.1 diff -a -u -r1.1 kolabconf.in --- kolabd/kolabconf.in 13 Sep 2005 14:38:22 -0000 1.1 +++ kolabd/kolabconf.in 27 Nov 2005 20:32:55 -0000 @@ -1,4 +1,4 @@ -#!@perl_exec@ +#!@PERL@ ## ## Copyright (c) 2003 Code Fusion cc Index: kolabd/kolabd.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.in,v retrieving revision 1.2 diff -a -u -r1.2 kolabd.in --- kolabd/kolabd.in 13 Sep 2005 15:39:47 -0000 1.2 +++ kolabd/kolabd.in 27 Nov 2005 20:32:56 -0000 @@ -1,4 +1,4 @@ -#!@perl_exec@ +#!@PERL@ ## ## Copyright (c) 2004 Klaraelvdalens Datakonsult AB Index: kolabd/kolabpasswd.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabpasswd.in,v retrieving revision 1.3 diff -a -u -r1.3 kolabpasswd.in --- kolabd/kolabpasswd.in 14 Oct 2005 14:59:00 -0000 1.3 +++ kolabd/kolabpasswd.in 27 Nov 2005 20:32:56 -0000 @@ -1,4 +1,4 @@ -#!@perl_exec@ -w +#!@PERL@ -w # The kolabpasswd script is used for changing the manager password on a Kolab Server. # In multi-location Kolab setups the script must be run on each individual host Index: kolabd/kolabquotawarn.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/kolabquotawarn.in,v retrieving revision 1.4 diff -a -u -r1.4 kolabquotawarn.in --- kolabd/kolabquotawarn.in 30 Sep 2005 12:44:16 -0000 1.4 +++ kolabd/kolabquotawarn.in 27 Nov 2005 20:32:56 -0000 @@ -1,4 +1,4 @@ -#!@perl_exec@ +#!@PERL@ ## ## Copyright (c) 2004 Klarälvdalens Datakonsult AB Index: kolabd/dist_conf/common =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v retrieving revision 1.3 diff -a -u -r1.3 common --- kolabd/dist_conf/common 27 Nov 2005 11:58:41 -0000 1.3 +++ kolabd/dist_conf/common 27 Nov 2005 20:32:56 -0000 @@ -9,8 +9,9 @@ -e 's,[@]localstatedir[@],$(localstatedir),g' \ -e 's,[@]phplibdir[@],$(phplibdir),g' \ -e 's,[@]phplibdir2[@],$(phplibdir2),g' \ - -e 's,[@]bash_exec[@],$(bash_exec),g' \ - -e 's,[@]perl_exec[@],$(perl_exec),g' \ + -e 's,[@]BASH[@],$(BASH),g' \ + -e 's,[@]PERL[@],$(PERL),g' \ + -e 's,[@]PHP[@],$(PHP),g' \ -e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \ -e 's,[@]VERSION[@],$(VERSION),g' \ -e 's,[@]amavisd_confdir[@],$(amavisd_confdir),g' \ @@ -38,6 +39,7 @@ -e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \ -e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \ -e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \ + -e 's,[@]freebusy_cachefile[@],$(freebusy_cachefile),g' \ -e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \ -e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \ -e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \ @@ -86,6 +88,7 @@ -e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \ -e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \ -e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \ + -e 's,[@]resmgr_filter[@],$(resmgr_filter),g' \ -e 's,[@]sasl_confdir[@],$(sasl_confdir),g' \ -e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \ -e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \ Index: kolabd/dist_conf/kolab =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v retrieving revision 1.3 diff -a -u -r1.3 kolab --- kolabd/dist_conf/kolab 27 Nov 2005 11:58:41 -0000 1.3 +++ kolabd/dist_conf/kolab 27 Nov 2005 20:32:56 -0000 @@ -21,8 +21,9 @@ kolab_rcdir=${sysconfdir}/rc.d -bash_exec=${libdir}/openpkg/bash -perl_exec=${bindir}/perl +BASH=${libdir}/openpkg/bash +PERL=${bindir}/perl +PHP=${bindir}/php amavisd_confdir=${sysconfdir}/amavisd amavisd_logfile=${localstatedir}/amavisd/amavis.log @@ -147,6 +148,7 @@ resmgr_logfile=${localstatedir}/resmgr/resmgr.log resmgr_confdir=${sysconfdir}/resmgr +resmgr_filter=${localstatedir}/resmgr/filter # @l_musr@ resmgr_usr=kolab # @l_ngrp@ @@ -154,6 +156,7 @@ fbview_logfile=${localstatedir}/resmgr/fbview.log freebusy_logfile=${localstatedir}/resmgr/freebusy.log +freebusy_cachefile=${webserver_document_root}/freebusy/cache graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db Index: kolabd/namespace/kolab.in =================================================================== RCS file: /kolabrepository/server/kolabd/kolabd/namespace/kolab.in,v retrieving revision 1.1 diff -a -u -r1.1 kolab.in --- kolabd/namespace/kolab.in 13 Sep 2005 14:38:22 -0000 1.1 +++ kolabd/namespace/kolab.in 27 Nov 2005 20:32:56 -0000 @@ -1,4 +1,4 @@ -#!@bash_exec@ +#!@BASH@ ## ## Kolab Namespace tool ## Derived with acknowledgement from: openpkg -- OpenPKG Tool Chain @@ -231,12 +231,12 @@ elif [ -f ${dir}/${cmd}.sh ]; then # found non-executable Bourne-Shell script cmd_path="${dir}/${cmd}.sh" - cmd_shell="@bash_exec@" + cmd_shell="@BASH@" elif [ -f ${dir}/${cmd}.pl ]; then # found non-executable Perl script cmd_path="${dir}/${cmd}.pl" - if [ -x @perl_exec@ ]; then - cmd_shell="@perl_exec@" + if [ -x @PERL@ ]; then + cmd_shell="@PERL@" else cmd_shell=`@libdir@/openpkg/shtool path -m perl 2>&1` if [ ".${cmd_shell}" = . ]; then