gunnar: server/kolab-webclient/horde/configuration/horde-3.3.6 10-kolab_conf_base.php, 1.2, 1.3 conf.php, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Thu Jan 21 23:34:54 CET 2010


Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6
In directory doto:/tmp/cvs-serv9944/configuration/horde-3.3.6

Modified Files:
	10-kolab_conf_base.php conf.php 
Log Message:
Update configuration for 3.3.6.

Index: 10-kolab_conf_base.php
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6/10-kolab_conf_base.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 10-kolab_conf_base.php	21 Jan 2010 19:57:42 -0000	1.2
+++ 10-kolab_conf_base.php	21 Jan 2010 22:34:52 -0000	1.3
@@ -10,12 +10,9 @@
 $conf['sql']['phptype'] = 'sqlite';
 
 $conf['auth']['driver'] = 'kolab';
+$conf['auth']['params']['login_block'] = false;
 
-$conf['accounts']['driver'] = 'kolab';
-$conf['accounts']['params']['attr'] = 'mail';
-$conf['accounts']['params']['strip'] = false;
-
-$conf['log']['priority'] = PEAR_LOG_DEBUG;
+$conf['log']['priority'] = PEAR_LOG_WARNING;
 $conf['log']['ident'] = 'HORDE';
 $conf['log']['params'] = array();
 $conf['log']['name'] = dirname(__FILE__) . '/../../../../webclient_data/log/horde.log';
@@ -23,8 +20,8 @@
 $conf['log']['type'] = 'file';
 $conf['log']['enabled'] = true;
 
-$conf['prefs']['driver'] = 'file';
 $conf['prefs']['params']['directory'] = dirname(__FILE__) . '/../../../../webclient_data/storage/';
+$conf['prefs']['driver'] = 'file';
 
 $conf['alarms']['params']['driverconfig'] = 'horde';
 $conf['alarms']['params']['ttl'] = 300;
@@ -36,23 +33,30 @@
 $conf['perms']['driverconfig'] = 'horde';
 $conf['perms']['driver'] = 'sql';
 
-$conf['share']['driver'] = 'kolab';
 $conf['share']['cache'] = true;
+$conf['share']['driver'] = 'kolab';
 
-$conf['cache']['driver'] = 'file';
+$conf['cache']['default_lifetime'] = 1800;
 $conf['cache']['params']['dir'] = $conf['tmpdir'];
 $conf['cache']['params']['sub'] = 0;
-$conf['cache']['default_lifetime'] = 1800;
+$conf['cache']['driver'] = 'file';
 
 $conf['mailer']['params']['host'] = 'localhost';
 $conf['mailer']['params']['port'] = 25;
 $conf['mailer']['params']['auth'] = true;
 $conf['mailer']['type'] = 'smtp';
 
-$conf['vfs']['type'] = 'file';
+$conf['token']['params']['token_dir'] = dirname(__FILE__) . '/../../../../webclient_data/tmp';
+$conf['token']['driver'] = 'file';
+
 $conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../../../../webclient_data/storage';
+$conf['vfs']['type'] = 'file';
 
-$conf['kolab']['enabled'] = true;
+$conf['accounts']['driver'] = 'kolab';
+$conf['accounts']['params']['attr'] = 'mail';
+$conf['accounts']['params']['strip'] = false;
+
+$conf['kolab']['ldap']['server'] = 'localhost';
 $conf['kolab']['ldap']['port'] = 389;
 $conf['kolab']['imap']['port'] = 143;
 $conf['kolab']['imap']['sieveport'] = 2000;
@@ -61,4 +65,5 @@
 $conf['kolab']['smtp']['port'] = 25;
 $conf['kolab']['misc']['multidomain'] = false;
 $conf['kolab']['cache_folders'] = true;
+$conf['kolab']['enabled'] = true;
 $conf['kolab']['freebusy']['server'] = 'https://localhost/freebusy';

Index: conf.php
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6/conf.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- conf.php	21 Jan 2010 22:25:04 -0000	1.1
+++ conf.php	21 Jan 2010 22:34:52 -0000	1.2
@@ -1,13 +1,13 @@
 <?php
 /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-// $Horde: horde/config/conf.xml,v 1.74.2.78 2008/09/12 10:01:41 jan Exp $
+// $Horde: horde/config/conf.xml,v 1.74.2.88 2009-09-02 08:21:46 jan Exp $
 $conf['vhosts'] = false;
-$conf['debug_level'] = E_ALL;
+$conf['debug_level'] = E_ALL & ~E_DEPRECATED;
 $conf['max_exec_time'] = 0;
 $conf['compress_pages'] = true;
 $conf['secret_key'] = 'abcdefghijklmnopqrstuvwxzy1234567890ABCD';
 $conf['umask'] = 077;
-$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
+$conf['tmpdir'] = dirname(__FILE__) . '/../../../../webclient_data/tmp/';
 $conf['use_ssl'] = 2;
 $conf['server']['name'] = $_SERVER['SERVER_NAME'];
 $conf['server']['port'] = $_SERVER['SERVER_PORT'];
@@ -20,36 +20,37 @@
 $conf['session']['cache_limiter'] = 'nocache';
 $conf['session']['timeout'] = 0;
 $conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
-$conf['cookie']['path'] = '/';
-$conf['sql']['database'] = dirname(__FILE__) . '/../storage/horde.db';
+$conf['cookie']['path'] = '/client';
+$conf['sql']['database'] = dirname(__FILE__) . '/../../../../webclient_data/storage/horde.db';
 $conf['sql']['mode'] = '0640';
 $conf['sql']['charset'] = 'utf-8';
 $conf['sql']['phptype'] = 'sqlite';
-$conf['auth']['admins'] = array('manager');
+$conf['auth']['admins'] = array();
 $conf['auth']['checkip'] = true;
 $conf['auth']['checkbrowser'] = true;
 $conf['auth']['alternate_login'] = false;
 $conf['auth']['redirect_on_logout'] = false;
-$conf['auth']['params']['app'] = 'imp';
-$conf['auth']['driver'] = 'application';
+$conf['auth']['list_users'] = 'list';
+$conf['auth']['driver'] = 'kolab';
+$conf['auth']['params']['login_block'] = false;
 $conf['signup']['allow'] = false;
-$conf['log']['priority'] = PEAR_LOG_DEBUG;
+$conf['log']['priority'] = PEAR_LOG_WARNING;
 $conf['log']['ident'] = 'HORDE';
 $conf['log']['params'] = array();
-$conf['log']['name'] = dirname(__FILE__) . '/../log/horde.log';
+$conf['log']['name'] = dirname(__FILE__) . '/../../../../webclient_data/log/horde.log';
 $conf['log']['params']['append'] = true;
 $conf['log']['type'] = 'file';
 $conf['log']['enabled'] = true;
 $conf['log_accesskeys'] = false;
+$conf['prefs']['params']['directory'] = dirname(__FILE__) . '/../../../../webclient_data/storage/';
 $conf['prefs']['driver'] = 'file';
-$conf['prefs']['params']['directory'] = dirname(__FILE__) . '/../storage/';
 $conf['alarms']['params']['driverconfig'] = 'horde';
 $conf['alarms']['params']['ttl'] = 300;
 $conf['alarms']['driver'] = 'sql';
 $conf['datatree']['params']['driverconfig'] = 'horde';
 $conf['datatree']['driver'] = 'sql';
 $conf['group']['driver'] = 'kolab';
-$conf['group']['cache'] = false;
+$conf['group']['cache'] = true;
 $conf['perms']['driverconfig'] = 'horde';
 $conf['perms']['driver'] = 'sql';
 $conf['share']['no_sharing'] = false;
@@ -57,17 +58,18 @@
 $conf['share']['cache'] = true;
 $conf['share']['driver'] = 'kolab';
 $conf['cache']['default_lifetime'] = 1800;
-$conf['cache']['params']['dir'] = Horde::getTempDir();
+$conf['cache']['params']['dir'] = $conf['tmpdir'];
 $conf['cache']['params']['sub'] = 0;
 $conf['cache']['driver'] = 'file';
 $conf['lock']['driver'] = 'none';
-$conf['token']['driver'] = 'none';
+$conf['token']['params']['token_dir'] = dirname(__FILE__) . '/../../../../webclient_data/tmp';
+$conf['token']['driver'] = 'file';
 $conf['mailer']['params']['host'] = 'localhost';
 $conf['mailer']['params']['port'] = 25;
 $conf['mailer']['params']['auth'] = true;
 $conf['mailer']['type'] = 'smtp';
 $conf['mailformat']['brokenrfc2231'] = false;
-$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../storage';
+$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../../../../webclient_data/storage';
 $conf['vfs']['type'] = 'file';
 $conf['sessionhandler']['type'] = 'none';
 $conf['sessionhandler']['memcache'] = false;
@@ -91,7 +93,9 @@
 $conf['hooks']['authldap'] = false;
 $conf['hooks']['groupldap'] = false;
 $conf['portal']['fixed_blocks'] = array();
-$conf['accounts']['driver'] = 'null';
+$conf['accounts']['driver'] = 'kolab';
+$conf['accounts']['params']['attr'] = 'mail';
+$conf['accounts']['params']['strip'] = false;
 $conf['user']['verify_from_addr'] = false;
 $conf['imsp']['enabled'] = false;
 $conf['kolab']['ldap']['server'] = 'localhost';
@@ -106,8 +110,6 @@
 $conf['kolab']['imap']['cache_folders'] = true;
 $conf['kolab']['smtp']['server'] = 'localhost';
 $conf['kolab']['smtp']['port'] = 25;
-$conf['kolab']['misc']['multidomain'] = false;
-$conf['kolab']['cache_folders'] = true;
 $conf['kolab']['freebusy']['server'] = 'https://localhost/freebusy';
 $conf['kolab']['enabled'] = true;
 $conf['memcache']['enabled'] = false;





More information about the commits mailing list