richard: server/kolabd/kolabd/dist_conf common, 1.7, 1.8 kolab, 1.7, 1.8 suse, 1.1, 1.2

[cvs at intevation.de]

Author: richard

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv26638/dist_conf

Modified Files:
	common kolab suse 
Log Message:
added phppeardir and changed BASH to BASHELL (it appeared after a little
experimenting that the variable BASH does not get updated in configure,
as it is already set by bash itself....)



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- common	17 Dec 2005 21:46:22 -0000	1.7
+++ common	19 Dec 2005 09:02:19 -0000	1.8
@@ -9,7 +9,8 @@
 	-e 's,[@]localstatedir[@],$(localstatedir),g' \
 	-e 's,[@]phplibdir[@],$(phplibdir),g' \
 	-e 's,[@]phplibdir2[@],$(phplibdir2),g' \
-	-e 's,[@]BASH[@],$(BASH),g' \
+	-e 's,[@]phppeardir[@],$(phppeardir),g' \
+	-e 's,[@]BASH[@],$(BASHELL),g' \
 	-e 's,[@]PERL[@],$(PERL),g' \
 	-e 's,[@]PHP[@],$(PHP),g' \
 	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolab	17 Dec 2005 11:10:31 -0000	1.7
+++ kolab	19 Dec 2005 09:02:19 -0000	1.8
@@ -19,7 +19,7 @@
 # @l_susr@
 kolab_susr=root
 
-BASH=${libdir}/openpkg/bash
+BASHELL=${libdir}/openpkg/bash
 PERL=${bindir}/perl
 PHP=${bindir}/php
 
@@ -142,6 +142,7 @@
 
 phplibdir=${libdir}/php
 phplibdir2=${kolab_statedir}/php
+phppeardir=${phplibdir}/pear
 
 sasl_confdir=${sysconfdir}/sasl
 sasl_logfile=${localstatedir}/sasl/log/saslauthd.log

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- suse	17 Dec 2005 11:10:31 -0000	1.1
+++ suse	19 Dec 2005 09:02:19 -0000	1.2
@@ -19,7 +19,7 @@
 # @l_susr@
 kolab_susr=root
 
-BASH=/bin/bash
+BASHELL=/bin/bash
 PERL=${bindir}/perl
 PHP=${bindir}/php
 
@@ -138,11 +138,12 @@
 webserver_sslscache=${webserver_logdir}/ssl_scache
 webserver_sslmutex=${webserver_logdir}/ssl_mutex
 webserver_musr=kolab
-webserver_usr=${kolab_usr}
-webserver_grp=${kolab_grp}
+webserver_usr=wwwrun
+webserver_grp=www
 
-phplibdir=${libdir}/php
-phplibdir2=${kolab_statedir}/php
+phplibdir=${datadir}/php
+phplibdir2=${datadir}/php
+phppeardir=${phplibdir}/PEAR
 
 sasl_confdir=${sysconfdir}/sasl
 sasl_logfile=${localstatedir}/sasl/log/saslauthd.log