martin: server/kolabd/kolabd/templates httpd.conf.template.in, 1.1, 1.2 php.ini.template.in, 1.1, 1.2 session_vars.php.template.in, 1.1, 1.2

[cvs at intevation.de]

Author: martin

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv31072/kolabd/templates

Modified Files:
	httpd.conf.template.in php.ini.template.in 
	session_vars.php.template.in 
Log Message:
Martin Konold: Applying patch from https://intevation.de/roundup/kolab/issue1017


Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- httpd.conf.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ httpd.conf.template.in	5 Dec 2005 16:21:34 -0000	1.2
@@ -233,7 +233,7 @@
 @@@endif@@@
    DavMinTimeout 600
    AddDefaultCharset Off  
-   php_value include_path ".:@webserver_phpdir@:@webserver_phpdir@/pear:/php/include:@phplibdir@"
+   php_value include_path ".:@phplibdir2@:@phplibdir2@/pear:/php/include:@phplibdir@"
    #php_admin_flag safe_mode on
 </Directory>
 
@@ -266,7 +266,7 @@
 <Directory "@webserver_document_root@/fbview">
     AllowOverride All
     Allow from all
-    php_value include_path ".:@webserver_phpdir@:@webserver_phpdir@/pear:/php/include:@phplibdir@"
+    php_value include_path ".:@phplibdir2@:@phplibdir2@/pear:/php/include:@phplibdir@"
 </Directory>
 
 <Directory "@webserver_document_root@/admin">

Index: php.ini.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- php.ini.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ php.ini.template.in	5 Dec 2005 16:21:34 -0000	1.2
@@ -370,7 +370,7 @@
 ;
 ; Windows: "\path1;\path2"
 ;include_path = ".;c:\php\includes"
-include_path = ".:/php/include:@phplibdir@:@webserver_phpdir@:@webserver_phpdir@/pear"
+include_path = ".:/php/include:@phplibdir@:@phplibdir2@:@phplibdir2@/pear"
 
 ; The root of the PHP pages, used only if nonempty.
 ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root

Index: session_vars.php.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/session_vars.php.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- session_vars.php.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ session_vars.php.template.in	5 Dec 2005 16:21:34 -0000	1.2
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=@webserver_phpdir@/admin/include/session_vars.php
+TARGET=@phplibdir2@/admin/include/session_vars.php
 PERMISSIONS=0640
 OWNERSHIP=@kolab_musr@:@kolab_grp@
 KOLAB_META_END