gunnar: server/horde/horde conf.php, 1.6, 1.7 horde-kolab.spec, 1.17, 1.18

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	conf.php horde-kolab.spec 
Log Message:
Make horde ready for the beta release.

Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/horde/conf.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- conf.php	4 Sep 2007 09:28:07 -0000	1.6
+++ conf.php	4 Oct 2007 09:47:55 -0000	1.7
@@ -1,6 +1,6 @@
 <?php
 /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-// $Horde: horde/config/conf.xml,v 1.183 2007/05/21 15:17:40 slusarz Exp $
+// $Horde: horde/config/conf.xml,v 1.194 2007/07/30 15:47:32 chuck Exp $
 $conf['vhosts'] = false;
 $conf['debug_level'] = E_ALL;
 $conf['max_exec_time'] = 0;
@@ -9,6 +9,7 @@
 $conf['use_ssl'] = 2;
 $conf['server']['name'] = $_SERVER['SERVER_NAME'];
 $conf['server']['port'] = $_SERVER['SERVER_PORT'];
+$conf['safe_ips'] = array();
 $conf['session']['name'] = 'Horde';
 $conf['session']['use_only_cookies'] = false;
 $conf['session']['cache_limiter'] = 'nocache';
@@ -39,6 +40,7 @@
 $conf['datatree']['driver'] = 'null';
 $conf['group']['driver'] = 'datatree';
 $conf['group']['cache'] = false;
+$conf['share']['no_sharing'] = false;
 $conf['share']['cache'] = false;
 $conf['share']['driver'] = 'kolab';
 $conf['cache']['default_lifetime'] = 1800;
@@ -49,7 +51,9 @@
 $conf['token']['driver'] = 'none';
 $conf['mailer']['params']['auth'] = '0';
 $conf['mailer']['type'] = 'smtp';
-$conf['vfs']['params']['vfsroot'] = '/tmp';
+$conf['mailformat']['brokenrfc2231'] = false;
+$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
+$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../tmp';
 $conf['vfs']['type'] = 'file';
 $conf['sessionhandler']['type'] = 'none';
 $conf['image']['convert'] = '/usr/bin/convert';
@@ -79,7 +83,7 @@
 $conf['kolab']['ldap']['port'] = 389;
 $conf['kolab']['ldap']['basedn'] = 'dc=example,dc=com';
 $conf['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
-$conf['kolab']['ldap']['phppw'] = '';
+$conf['kolab']['ldap']['phppw'] = 'dummy';
 $conf['kolab']['imap']['server'] = 'localhost';
 $conf['kolab']['imap']['port'] = 143;
 $conf['kolab']['imap']['sieveport'] = 2000;
@@ -89,6 +93,7 @@
 $conf['kolab']['smtp']['port'] = 25;
 $conf['kolab']['misc']['multidomain'] = false;
 $conf['kolab']['enabled'] = true;
+$conf['memcache']['enabled'] = false;
 /* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
 if (file_exists(dirname(__FILE__) . '/kolab.php')) {
   require_once(dirname(__FILE__) . '/kolab.php');

Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- horde-kolab.spec	1 Oct 2007 15:47:19 -0000	1.17
+++ horde-kolab.spec	4 Oct 2007 09:47:55 -0000	1.18
@@ -3,7 +3,7 @@
 %define         V_package %{V_horde_name}-kolab
 %define         V_year  2007
 %define         V_month 10
-%define         V_day   01
+%define         V_day   04
 %define         V_version 3.2_alpha
 %define         V_uver    3.2-alpha
 %define         V_date %{V_year}-%{V_month}-%{V_day}