gunnar: server/horde/horde conf.php, 1.5, 1.6 horde-kolab-conf.template, 1.2, 1.3

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv8160

Modified Files:
	conf.php horde-kolab-conf.template 
Log Message:
Fixes to the horde configuration (log file, unused configs).

Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/horde/conf.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- conf.php	16 Aug 2007 08:10:24 -0000	1.5
+++ conf.php	4 Sep 2007 09:28:07 -0000	1.6
@@ -29,7 +29,7 @@
 $conf['log']['priority'] = PEAR_LOG_NOTICE;
 $conf['log']['ident'] = 'HORDE';
 $conf['log']['params'] = array();
-$conf['log']['name'] = '/kolab/var/apache2/log/horde/horde.log';
+$conf['log']['name'] = '/tmp/horde.log';
 $conf['log']['params']['append'] = true;
 $conf['log']['type'] = 'file';
 $conf['log']['enabled'] = true;

Index: horde-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab-conf.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-kolab-conf.template	3 Aug 2007 07:38:08 -0000	1.2
+++ horde-kolab-conf.template	4 Sep 2007 09:28:07 -0000	1.3
@@ -4,13 +4,14 @@
 OWNERSHIP=kolab-n:kolab-n
 KOLAB_META_END
 <?php
+$conf['log']['name'] = '@@@webserver_logdir@@@/horde/horde.log';
 $conf['cookie']['domain'] = '@@@fqdnhostname@@@';
 $conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
 $conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
+$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
 $conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
 $conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
 $conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
 $conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
 $conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
-$conf['kolab']['imap']['adminpw'] = '@@@bind_pw@@@';
 ?>