[pkg-kolab] r73 - in trunk/kolab-resource-handlers/debian: . patches
Steffen Joeris
white-guest at costa.debian.org
Wed Jan 4 13:28:01 UTC 2006
Author: white-guest
Date: 2006-01-04 13:28:01 +0000 (Wed, 04 Jan 2006)
New Revision: 73
Added:
trunk/kolab-resource-handlers/debian/patches/
trunk/kolab-resource-handlers/debian/patches/00list
trunk/kolab-resource-handlers/debian/patches/10-resmgr.conf.dpatch
Removed:
trunk/kolab-resource-handlers/debian/resmgr.conf
Modified:
trunk/kolab-resource-handlers/debian/rules
Log:
* add lines to debian/rules
* add dpatch
Added: trunk/kolab-resource-handlers/debian/patches/00list
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/00list 2006-01-04 13:23:55 UTC (rev 72)
+++ trunk/kolab-resource-handlers/debian/patches/00list 2006-01-04 13:28:01 UTC (rev 73)
@@ -0,0 +1 @@
+10-resmgr.conf
Added: trunk/kolab-resource-handlers/debian/patches/10-resmgr.conf.dpatch
===================================================================
--- trunk/kolab-resource-handlers/debian/patches/10-resmgr.conf.dpatch 2006-01-04 13:23:55 UTC (rev 72)
+++ trunk/kolab-resource-handlers/debian/patches/10-resmgr.conf.dpatch 2006-01-04 13:28:01 UTC (rev 73)
@@ -0,0 +1,68 @@
+#!/bin/sh -e
+## 10-resmgr.conf.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Here we correct the pathes of the conffile
+
+if [ $# -lt 1 ]; then
+echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+ 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', '/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,10 +69,11 @@
+ $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.
+ // One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; RM_LOG_INFO or RM_LOG_DEBUG.
+ $params['log_level'] = RM_LOG_DEBUG;
+ ?>
+\ No newline at end of file
++
Property changes on: trunk/kolab-resource-handlers/debian/patches/10-resmgr.conf.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/kolab-resource-handlers/debian/resmgr.conf
===================================================================
--- trunk/kolab-resource-handlers/debian/resmgr.conf 2006-01-04 13:23:55 UTC (rev 72)
+++ trunk/kolab-resource-handlers/debian/resmgr.conf 2006-01-04 13:28:01 UTC (rev 73)
@@ -1,79 +0,0 @@
-<?php
-// 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'] = 'xyz';
-
-
-// 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';
-
-// 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';
-
-// PFB url to trigger creation of pfb
-$params['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/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;
-?>
-
Modified: trunk/kolab-resource-handlers/debian/rules
===================================================================
--- trunk/kolab-resource-handlers/debian/rules 2006-01-04 13:23:55 UTC (rev 72)
+++ trunk/kolab-resource-handlers/debian/rules 2006-01-04 13:28:01 UTC (rev 73)
@@ -37,7 +37,7 @@
dh_testroot
dh_clean -k
dh_installdirs
-
+
# install the resource manager php scripts
install -D -m 644 kolab-resource-handlers/resmgr/kolabfilter.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/kolabfilter.php
install -D -m 644 kolab-resource-handlers/resmgr/kolabmailboxfilter.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/kolabmailboxfilter.php
@@ -45,8 +45,6 @@
install -D -m 644 kolab-resource-handlers/resmgr/misc.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/misc.php
install -D -m 644 kolab-resource-handlers/resmgr/olhacks.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/olhacks.php
install -D -m 644 kolab-resource-handlers/resmgr/resmgr.php debian/kolab-resource-handlers/usr/share/kolab-resource-handlers/resmgr.php
-
- install -D -m 644 debian/resmgr.conf debian/kolab-resource-handlers/etc/kolab/resmgr.conf
binary-arch: build install
# We are binary-indep so nothing to do here.
@@ -56,14 +54,11 @@
dh_testroot
dh_installchangelogs
dh_installdocs
-# dh_installexamples
-# dh_installinit
# dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_perl
dh_installdeb
dh_shlibdeps
dh_gencontrol
More information about the pkg-kolab-devel
mailing list