richard: server/kolabd/kolabd/templates master.cf.template.in, 1.11, 1.12

[cvs at intevation.de]

Author: richard

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

Modified Files:
	master.cf.template.in 
Log Message:
Introduce a new variable for the directory that holds the
php.ini file to be used.



Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- master.cf.template.in	9 Mar 2006 21:52:02 -0000	1.11
+++ master.cf.template.in	20 Mar 2006 21:06:50 -0000	1.12
@@ -87,7 +87,7 @@
 kolabpolicy    unix  -       n       n       -       -       spawn user=@emailserver_master_usr@ argv=@kolab_scriptsdir@/kolab_smtpdpolicy 
 
 kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php
-    -c @webserver_confdir@/php.ini
+    -c @phpini_dir@/php.ini
     -f @resmgr_scriptsdir@/kolabfilter.php 
     --
     -h @@@fqdnhostname@@@
@@ -97,7 +97,7 @@
     -u ${sasl_username}
 
 kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ flags=n argv=@bindir@/php
-    -c @webserver_confdir@/php.ini
+    -c @phpini_dir@/php.ini
     -f @resmgr_scriptsdir@/kolabmailboxfilter.php 
     --
     -h @@@fqdnhostname@@@