richard: server/kolabd/kolabd/dist_conf common, 1.27, 1.28 kolab, 1.33, 1.34 suse, 1.44, 1.45
cvs at intevation.de
cvs at intevation.de
Mon Mar 20 22:06:53 CET 2006
Author: richard
Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv9140/dist_conf
Modified Files:
common kolab suse
Log Message:
Introduce a new variable for the directory that holds the
php.ini file to be used.
Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- common 9 Mar 2006 21:52:02 -0000 1.27
+++ common 20 Mar 2006 21:06:50 -0000 1.28
@@ -7,6 +7,7 @@
-e 's,[@]datadir[@],$(datadir),g' \
-e 's,[@]libexecdir[@],$(libexecdir),g' \
-e 's,[@]localstatedir[@],$(localstatedir),g' \
+ -e 's,[@]phpini_dir[@],$(phpini_dir),g' \
-e 's,[@]phplibdir[@],$(phplibdir),g' \
-e 's,[@]phplibdir2[@],$(phplibdir2),g' \
-e 's,[@]phppeardir[@],$(phppeardir),g' \
Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- kolab 9 Mar 2006 21:52:02 -0000 1.33
+++ kolab 20 Mar 2006 21:06:50 -0000 1.34
@@ -158,6 +158,7 @@
webserver_grp=${kolab_grp}
webserver_rpm=apache
+phpini_dir=${sysconfdir}/apache
phplibdir=${libdir}/php
phplibdir2=${kolab_statedir}/php
phppeardir=${phplibdir2}/pear
Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- suse 16 Mar 2006 10:46:39 -0000 1.44
+++ suse 20 Mar 2006 21:06:50 -0000 1.45
@@ -121,7 +121,7 @@
webserver_document_root=/srv/www/htdocs
webserver_cgidir=${webserver_document_root}/cgi-bin
-webserver_sessions=${localstatedir}/kolab/httpd_sessions
+webserver_sessions=${localstatedir}/lib/php
webserver_logdir=${localstatedir}/log/apache2
webserver_acceptlock=${webserver_logdir}/accept.lock
webserver_runtime_status=${webserver_logdir}/apache_runtime_status
@@ -139,7 +139,8 @@
webserver_grp=www
webserver_rpm=apache2
-phplibdir=${datadir}/php
+phpini_dir=${sysconfdir}
+phplibdir=${datadir}/php:/srv/www/htdocs/horde/lib
phplibdir2=${datadir}/php
phppeardir=${phplibdir}/PEAR
More information about the commits
mailing list