[pkg-kolab] r598 - kolab-resource-handlers/trunk/debian/patches

[opensides-guest at alioth.debian.org]

Author: opensides-guest
Date: 2007-06-05 21:26:17 +0000 (Tue, 05 Jun 2007)
New Revision: 598

Modified:
   kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
Log:
Corrected PASSWORD entries en place of xyz to match README.Debian
Corrected freebusy url



Modified: kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch	2007-06-05 20:11:00 UTC (rev 597)
+++ kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch	2007-06-05 21:26:17 UTC (rev 598)
@@ -1,44 +1,78 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-resmgr.conf.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## DP: Here we correct the pathes of the conffile
+<?php
+// Example conf file for resmgr!
 
- at DPATCH@
---- kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/resmgr.conf.orig	2006-01-04 13:52:17.000000000 +0100
-+++ kolab-resource-handlers-0.3.9/kolab-resource-handlers/resmgr/resmgr.conf	2006-01-04 13:51:56.000000000 +0100
-@@ -2,7 +2,7 @@
- // Example conf file for resmgr!
+// What is the root directory of our Horde instance?
+ at define('HORDE_BASE', '/var/kolab/www/fbview');
+
+// What is the address of the Cyrus server where the calendar data is stored?
+$params['server'] = 'localhost';
+
+// 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'] = 'example.com';
+
+// 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;
+
+// Should we make sure that the sender and From header match for mail
+// that origins on this server?
+$params['verify_from_header'] = true;
+
+// Should we perform this check on mail from our
+// subdomains too?
+$params['verify_subdomains'] = true;
+
+// Should the Sender: header be used over From: if present?
+$params['allow_sender_header'] = true;
+
+// Should reject messages with From headers that dont match
+// the envelope? Default is to rewrite the header
+$params['reject_forged_from_header'] = false;
+
+// Should we allow forwarded ical messages from Outlook
+// by encapsulating them in a MIME multipart
+$params['allow_outlook_ical_forward']  = true;
+
+// LDAP data
+// What is the address of the LDAP server address where user objects reside
+$params['ldap_uri'] = 'ldaps://localhost';
+
+// What is the Base DN of our LDAP database?
+$params['base_dn'] = 'dc=example,dc=com';
+
+// What DN should we use to bind to the LDAP server?
+$params['bind_dn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
+
+// What password should we use with the above DN when binding?
+$params['bind_pw'] = 'PASSWORD';
+
+
+// What account should we use to read/write calendar data? This account should
+// have access to the calendar mailbox of all resource/group mailboxes.
+$params['calendar_user'] = 'calendar@'.$params['email_domain'];
+$params['calendar_pass'] = 'PASSWORD';
+
+// Filename of private key used to decrypt password from LDAP
+$params['priv_key_file'] = '/etc/kolab/res_priv.pem';
+
+// What is the name of the users' calendar mailbox?
+$params['calendar_store'] = 'Calendar';
+
+// Where can we get free/busy information from?
+$params['freebusy_url'] = 'http://kolab.example.com/freebusy/${USER}.ifb';
  
- // What is the root directory of our Horde instance?
-- at define('HORDE_BASE', '/kolab/var/kolab/www/fbview');
-+ at define('HORDE_BASE', '/var/kolab/www/fbview');
- 
- // What is the address of the Cyrus server where the calendar data is stored?
- $params['server'] = 'localhost';
-@@ -39,7 +39,7 @@
- 
- // LDAP data
- // What is the address of the LDAP server address where user objects reside
--$params['ldap_uri'] = 'ldaps://ldap.example.com';
-+$params['ldap_uri'] = 'ldaps://localhost';
- 
- // What is the Base DN of our LDAP database?
- $params['base_dn'] = 'dc=example,dc=com';
-@@ -57,7 +57,7 @@
- $params['calendar_pass'] = 'zyx';
- 
- // Filename of private key used to decrypt password from LDAP
--$params['priv_key_file'] = '/kolab/etc/kolab/res_priv.pem';
-+$params['priv_key_file'] = '/etc/kolab/res_priv.pem';
- 
- // What is the name of the users' calendar mailbox?
- $params['calendar_store'] = 'Calendar';
-@@ -69,7 +69,7 @@
- $params['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
- 
- // Where are we logging to?
--$params['log'] = 'file:/kolab/var/resmgr/resmgr.log';                // File...
-+$params['log'] = 'file:/var/log/kolab/resmgr.log';                // File...
- // $params['log'] = 'syslog:cons, pid';            // Or syslog...
- 
- // What level of output should we log? Higher levels give more verbose output.
+// PFB url to trigger creation of pfb
+$params['pfb_trigger_url'] = 'http://kolab.example.com/freebusy/trigger/${USER}/${FOLDER}.xpfb';
+
+// Where are we logging to?
+$params['log'] = 'file:/var/log/kolab/resmgr.log';                // File...
+// $params['log'] = 'syslog:cons, pid';            // Or syslog...
+
+// What level of output should we log? Higher levels give more verbose output.
+// One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; RM_LOG_INFO or RM_LOG_DEBUG.
+$params['log_level'] = RM_LOG_DEBUG;
+?>