[pkg-kolab] r623 - in kolab-resource-handlers/trunk/debian: . patches

[petere at alioth.debian.org]

Author: petere
Date: 2007-06-20 17:02:27 +0000 (Wed, 20 Jun 2007)
New Revision: 623

Modified:
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/freebusy.conf
   kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
Log:
Revert breakage

Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-06-19 22:56:37 UTC (rev 622)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-06-20 17:02:27 UTC (rev 623)
@@ -1,13 +1,3 @@
-kolab-resource-handlers (0.3.9-20060811-5) unstable; urgency=low
-
-  [ Benoit Mortier ]
-  * Corrected freebusy.conf to be the same as in README.Debian
-  * Corrected freebusy.conf home_server parameter
-  * Corrected resmgr.conf pfb url
-  * Corrected bind_pw and calendar_pass to match example in README.Debian 
-
- -- Benoit Mortier <benoit.mortier at opensides.be>  Wed, 6 June 2007 12:21:00 +0100
-
 kolab-resource-handlers (0.3.9-20060811-4) unstable; urgency=low
 
   [ Peter Eisentraut ]

Modified: kolab-resource-handlers/trunk/debian/freebusy.conf
===================================================================
--- kolab-resource-handlers/trunk/debian/freebusy.conf	2007-06-19 22:56:37 UTC (rev 622)
+++ kolab-resource-handlers/trunk/debian/freebusy.conf	2007-06-20 17:02:27 UTC (rev 623)
@@ -1,7 +1,7 @@
 <?php
 
 // What is the address of the Cyrus server where the calendar data is stored?
-$params['server'] = 'kolabserver.example.com';
+$params['server'] = 'server.example.com';
 
 // What is the address of the LDAP server address where user objects reside
 $params['ldap_uri'] = 'ldap://127.0.0.1:389';
@@ -21,7 +21,7 @@
 $params['multi_location'] = true;
 
 // What LDAP attribute is used to store the users' home server address?
-$params['home_server'] = 'kolabhomeServer';
+$params['home_server'] = 'homeServer';
 
 // 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.

Modified: kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch	2007-06-19 22:56:37 UTC (rev 622)
+++ kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch	2007-06-20 17:02:27 UTC (rev 623)
@@ -1,5 +1,11 @@
---- resmgr.conf.orig	2007-06-06 12:13:48.000000000 +0200
-+++ resmgr.conf	2007-06-06 12:13:56.000000000 +0200
+#!/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
+
+ 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!
  
@@ -18,37 +24,21 @@
  
  // What is the Base DN of our LDAP database?
  $params['base_dn'] = 'dc=example,dc=com';
-@@ -48,16 +48,16 @@
- $params['bind_dn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
+@@ -57,7 +57,7 @@
+ $params['calendar_pass'] = 'zyx';
  
- // What password should we use with the above DN when binding?
--$params['bind_pw'] = 'xyz';
-+$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'] = 'zyx';
-+$params['calendar_pass'] = 'PASSWORD';
- 
  // 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';
-@@ -66,7 +66,7 @@
- $params['freebusy_url'] = 'http://kolab.example.com/freebusy/${USER}.ifb';
-  
- // PFB url to trigger creation of pfb
--$params['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
-+$params['pfb_trigger_url'] = 'http://kolab.example.com/freebusy/trigger/${USER}/${FOLDER}.xpfb';
+@@ -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...
-@@ -77,4 +77,3 @@
- $params['log_level'] = RM_LOG_DEBUG;
- ?>
+-$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.