[pkg-kolab] r599 - kolab-resource-handlers/trunk/debian/patches
opensides-guest at alioth.debian.org
opensides-guest at alioth.debian.org
Tue Jun 5 22:01:39 UTC 2007
Author: opensides-guest
Date: 2007-06-05 22:01:39 +0000 (Tue, 05 Jun 2007)
New Revision: 599
Modified:
kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
Log:
Corrected commit 598, something strange happened, must go to bed
Modified: kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch
===================================================================
--- kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch 2007-06-05 21:26:17 UTC (rev 598)
+++ kolab-resource-handlers/trunk/debian/patches/10-resmgr.conf.dpatch 2007-06-05 22:01:39 UTC (rev 599)
@@ -1,78 +1,66 @@
-<?php
-// Example conf file for resmgr!
+#!/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
+## DP: We also correct to PASSWORD entries to match documentation
+## DP: We also correct the freebusy url
-// 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';
+ at DPATCH@
+--- resmgr.conf.orig 2006-08-11 15:50:46.000000000 +0200
++++ resmgr.conf 2007-06-05 23:51:37.000000000 +0200
+@@ -2,7 +2,7 @@
+ // Example conf file for resmgr!
-// 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;
-?>
+ // 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';
+@@ -48,16 +48,16 @@
+ $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'] = '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,13 +66,13 @@
+ $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';
+
+ // 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.
+ // One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; RM_LOG_INFO or RM_LOG_DEBUG.
+ $params['log_level'] = RM_LOG_DEBUG;
+-?>
+\ Pas de fin de ligne à la fin du fichier.
++?>
More information about the pkg-kolab-devel
mailing list