gunnar: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.10, 1.11
cvs at kolab.org
cvs at kolab.org
Thu Nov 22 18:08:44 CET 2007
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv3661/kolabd/kolabd/templates
Modified Files:
freebusy.conf.template.in
Log Message:
Updated kolabd template for the restructure kolab-freebusy.
Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- freebusy.conf.template.in 16 Aug 2007 10:47:10 -0000 1.10
+++ freebusy.conf.template.in 22 Nov 2007 17:08:42 -0000 1.11
@@ -39,112 +39,73 @@
*
*/
-// Kolab prefix
-$params['kolab_prefix'] = '@prefix@';
-
-// What is the address of the Cyrus server where the calendar data is stored?
-// This is also used as the LDAP server address where user objects reside
-$params['server'] = '@@@fqdnhostname@@@';
-
-// What is the address of the LDAP server address where user objects reside
-$params['ldap_uri'] = '@@@ldap_uri@@@';
-
-// What is the Base DN of our LDAP database?
-$params['base_dn'] = '@@@base_dn@@@';
-
-// What DN should we use to bind to the LDAP server?
-$params['bind_dn'] = '@@@php_dn@@@';
-
-// What password should we use with the above DN when binding?
-$params['bind_pw'] = '@@@php_pw@@@';
-
-// Are we using a multi-location setup? If this is true, we check the users'
-// LDAP object for the next attribute - if it is different than $params['server']
-// we get the free/busy information from the script running on the other box
-$params['multi_location'] = true;
-
-// What LDAP attribute is used to store the users' home server address?
-$params['home_server'] = 'kolabhomeserver';
-
-// What is our default mail domain? This is used if any users do not have
-// '@domain' specified after their username as part of their email address.
-$params['email_domain'] = '@@@postfix-mydomain@@@';
-
-// Are we using virtual domains with Cyrus?
-$params['virtual_domains'] = true;
-
-// Should we append domains to mailbox URIs? This only applies when
-// virtual_domains is true, and when using manager accounts.
-$params['append_domains'] = false;
-
-// What account should we use to read in calendar data in the case the user
-// does not supply credentials? This account should
-// have access to the calendar mailbox of all the users for which free/busy
-// information is to be retrieved.
-//$params['calendar_user'] = '@ @@cyrus-admins@@@';
-
-// What password should we use with the above account?
-//$params['calendar_pass'] = '@ @@bind_pw@@@';
-
-// What is the name of the users' calendar mailbox?
-$params['calendar_store'] = 'Calendar';
-
-// How many days of free/busy data should we generate?
-$params['freebusy_days'] = 56;
+$conf = array();
-// Should we generate extended free/busy information? This can be overridden by
-// the URL parameter "x" (= 0 or 1).
-$params['extended'] = false;
+/* Horde::Log configuration */
+$conf['log']['enabled'] = true;
+$conf['log']['priority'] = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
+$conf['log']['type'] = 'file';
+$conf['log']['name'] = '@freebusy_logdir@/freebusy.log';
+$conf['log']['ident'] = 'Kolab Free/Busy';
+$conf['log']['params']['append'] = true;
-// Should we use the caching mechanism, which avoids having to always re-read
-// all the events? This can be overridden by the URL parameter "c" (= 0 or 1).
-$params['cache'] = true;
+/* PHP error logging */
+ini_set('error_log', '@freebusy_logdir@/php-error.log');
-// Should we redirect using a Location header, if the user is not local? If this
-// is false we silently download the file ourselves and output it so that it
-// looks as though the free/busy information is coming from us.
-$params['redirect'] = false;
+/* Horde::Kolab::LDAP configuration */
+$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
+$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
+$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
-// Should we send a Content-Type header, indicating what the mime type of the
-// resulting VFB file is?
-$params['send_content_type'] = false;
+/* Horde::Kolab::IMAP configuration */
+$conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['imap']['port'] = 143;
+$conf['kolab']['imap']['protocol'] = 'notls/readonly';
-// Should we send a Content-Length header, indicating how large the resulting
-// VFB file is?
-$params['send_content_length'] = false;
+/* Horde::Auth configuration */
+$conf['auth']['params']['login_block'] = 0;
+$conf['auth']['checkbrowser'] = false;
+$conf['auth']['checkip'] = false;
-// Should we send a Content-Disposition header, indicating what the name of the
-// resulting VFB file should be?
-$params['send_content_disposition'] = false;
+/* Kolab::Freebusy configuration */
-// Where are we logging to?
-$params['log'] = 'file:@freebusy_logfile@'; // File...
-// $params['log'] = 'syslog:cons, pid'; // Or syslog...
+/* Should we redirect using a Location header, if the user is not local? If this
+ * is false we silently download the file ourselves and output it so that it
+ * looks as though the free/busy information is coming from us.
+ */
+$conf['fb']['redirect'] = false;
-// What level of output should we log? Higher levels give more verbose output.
-// One of: 0 (RM_LOG_SILENT); 1 (RM_LOG_ERROR); 2 (RM_LOG_WARN); 3 (RM_LOG_INFO) or 4 (RM_LOG_DEBUG).
-$params['log_level'] = 4;
+/* What is the address of the current server where the calendar data is stored?
+ * This is also used as the LDAP server address where user objects reside.
+ */
+$conf['fb']['server'] = '@@@fqdnhostname@@@';
-// What db type to use for freebusy caches
-$params['dbtype'] = 'db4';
+/* What is our default mail domain? This is used if any users do not have
+ * '@domain' specified after their username as part of their email address.
+ */
+$conf['fb']['email_domain'] = '@@@fqdnhostname@@@';
-// IMAP options passed to imap_open
-//$params['imap_options'] = "/notls/secure/readonly";
-$params['imap_options'] = "/notls/readonly";
+/* Location of the cache files */
+$conf['fb']['cache_dir'] = '@freebusy_cachedir@';
-$params['pfb_dbformat'] = 'db4';
+/* What db type to use for the freebusy caches */
+$conf['fb']['dbformat'] = 'db4';
-// Location of the cache files
-$params['cache_dir'] = '@freebusy_cachedir@';
+/* Should we send a Content-Type header, indicating what the mime type of the
+ * resulting VFB file is?
+ */
+$conf['fb']['send_content_type'] = false;
-// don't change this if you don't have to
-//$params['ldap_classname_suffix'] = "_dummy";
+/* Should we send a Content-Length header, indicating how large the resulting
+ * VFB file is?
+ */
+$conf['fb']['send_content_length'] = false;
-// Activate if you wish to use the new horde framework
-// (horde-framework-kolab) package instead of the old code in
-// kolab-horde-framework. This is still untested and considered
-// UNSAFE!
-$params['use_new_horde'] = false;
+/* Should we send a Content-Disposition header, indicating what the name of the
+ * resulting VFB file should be?
+ */
+$conf['fb']['send_content_disposition'] = false;
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//
@@ -157,3 +118,15 @@
// diff -Nau kolab-freebusy/freebusy/config.php kolabd/kolabd/templates/freebusy.conf.template.in
//
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+// DEBUGGING
+// =========
+//
+// Activate this to see the log messages on the screen
+// $conf['log']['type'] = 'display';
+//
+// Activate this to see the php messages on the screen
+// ini_set('display_errors', 1);
+//
+// Both setting will disrupt header delivery (which should not cause a
+// problem).
More information about the commits
mailing list