[pkg-kolab] r624 - in kolabd/trunk/debian: . patches
petere at alioth.debian.org
petere at alioth.debian.org
Wed Jun 20 17:05:46 UTC 2007
Author: petere
Date: 2007-06-20 17:05:46 +0000 (Wed, 20 Jun 2007)
New Revision: 624
Removed:
kolabd/trunk/debian/kolab_smtpdpolicy.conf
kolabd/trunk/debian/patches/90-kolab-ssl-certs
Modified:
kolabd/trunk/debian/README.Debian
kolabd/trunk/debian/changelog
kolabd/trunk/debian/patches/00list
kolabd/trunk/debian/rules
Log:
Revert breakage
Modified: kolabd/trunk/debian/README.Debian
===================================================================
--- kolabd/trunk/debian/README.Debian 2007-06-20 17:02:27 UTC (rev 623)
+++ kolabd/trunk/debian/README.Debian 2007-06-20 17:05:46 UTC (rev 624)
@@ -331,13 +331,6 @@
enough to enter localhost, so use a valid name (e.g., your real host
name).
-!! Attention !!
-The line transport_maps = ldap:/etc/postfix/kolab-ldaptransport.cf
-should be removed when there is only one kolab server on the same box
-
-If the transport line is not removed you will have errors like this
-'xxx.example.com loopback to myself' on you mail.log
-
5.3. /etc/postfix/kolab-ldap*.cf
Adjust these files for your local situation, in particular the domains
@@ -403,7 +396,7 @@
$params['bind_pw'] = 'PASSWORD';
$params['calendar_user'] = 'calendar@'.$params['email_domain'];
$params['calendar_pass'] = 'PASSWORD';
-$params['freebusy_url'] = 'https://kolabserver.example.com/freebusy/${USER}.xfb';
+$params['freebusy_url'] = 'https://server.example.com/freebusy/${USER}.xfb';
Remember to change PASSWORD to the nobody password. (With the example
.ldif the nobody password is
@@ -421,7 +414,6 @@
$params['base_dn'] = 'dc=example,dc=com';
$params['bind_dn'] = 'cn=nobody,cn=internal,dc=example,dc=com';
$params['bind_pw'] = 'PASSWORD';
-$params['email_domain'] = 'example.com';
We need some files from Horde, and the easiest way is to create this
link:
Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog 2007-06-20 17:02:27 UTC (rev 623)
+++ kolabd/trunk/debian/changelog 2007-06-20 17:05:46 UTC (rev 624)
@@ -1,14 +1,3 @@
-kolabd (1.9.4-20060707.dfsg-5) unstable; urgency=low
-
- [ Benoit Mortier ]
- * Corrected README.Debian part 7 Resource manager
- * Added an explanation in README.Debian when transport_maps is no needed
- in postfix
- * Corrected errors in kolab_ssl_certs.sh
- * Added the config file for kolab_smtpdpolicy
-
- -- Benoit Mortier <benoit.mortier at opensides.be> Wed, 06 Jun 2007 12:35:00 +0100
-
kolabd (1.9.4-20060707.dfsg-4) unstable; urgency=low
[ Steffen Joeris ]
Deleted: kolabd/trunk/debian/kolab_smtpdpolicy.conf
===================================================================
--- kolabd/trunk/debian/kolab_smtpdpolicy.conf 2007-06-20 17:02:27 UTC (rev 623)
+++ kolabd/trunk/debian/kolab_smtpdpolicy.conf 2007-06-20 17:05:46 UTC (rev 624)
@@ -1,15 +0,0 @@
-# (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
-#
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
-
-# this file is automatically written by the Kolab config backend
-# manual additions are lost unless made to the template in the Kolab config directory
-
-ldap_uri: ldap://127.0.0.1:389
-basedn: dc=example,dc=com
-binddn: cn=nobody,cn=internal,dc=example,dc=com
-bindpw: PASSWORD
-domain: example.com
-allow_unauth: 1
-permithosts: kolabserver.example.com
Modified: kolabd/trunk/debian/patches/00list
===================================================================
--- kolabd/trunk/debian/patches/00list 2007-06-20 17:02:27 UTC (rev 623)
+++ kolabd/trunk/debian/patches/00list 2007-06-20 17:05:46 UTC (rev 624)
@@ -5,4 +5,3 @@
60-kolabdcachetool-cachefiles
70-kolab2.schema-removal.of.rfc2739.dpatch
80-kolab-syslog-facility
-90-kolab-ssl-certs
Deleted: kolabd/trunk/debian/patches/90-kolab-ssl-certs
===================================================================
--- kolabd/trunk/debian/patches/90-kolab-ssl-certs 2007-06-20 17:02:27 UTC (rev 623)
+++ kolabd/trunk/debian/patches/90-kolab-ssl-certs 2007-06-20 17:05:46 UTC (rev 624)
@@ -1,36 +0,0 @@
---- kolabd-1.9.4-20060707.dfsg/kolab_sslcert.sh.orig 2007-06-06 20:19:22.000000000 +0200
-+++ kolabd-1.9.4-20060707.dfsg/kolab_sslcert.sh 2007-06-06 20:24:30.000000000 +0200
-@@ -6,7 +6,7 @@
- ## Read the file COPYING that comes with this packages for details.
-
-
--cd @l_prefix@/etc/kolab
-+cd /etc/ssl/certs
-
- if [ $1 ];then
- HN=$1
-@@ -30,18 +30,18 @@
-
- echo -n "generate self-signed certificate for hostname $HN... "
-
-- /kolab/bin/openssl req -new -x509 -outform PEM -keyform PEM -nodes \
-+ /usr/bin/openssl req -new -x509 -outform PEM -keyform PEM -nodes \
- -days 3650 -out cert.pem -keyout key.pem \
- -config tmp.req.cnf >/dev/null 2>&1
- echo "done"
-
--chgrp @l_rusr@ key.pem
--chmod 0640 key.pem
--chgrp @l_rusr@ cert.pem
--chmod 0640 cert.pem
-+chgrp mail kolab-key.pem
-+chmod 0640 kolab-key.pem
-+chgrp mail kolab-cert.pem
-+chmod 0640 kolab-cert.pem
-
- #rm -f tmp.req.cnf
-
- cd -
-
--echo "New certificate has been installed under @l_prefix@/etc/kolab/"
-+echo "New certificate has been installed under /etc/ssl/certs"
Modified: kolabd/trunk/debian/rules
===================================================================
--- kolabd/trunk/debian/rules 2007-06-20 17:02:27 UTC (rev 623)
+++ kolabd/trunk/debian/rules 2007-06-20 17:05:46 UTC (rev 624)
@@ -56,9 +56,6 @@
install -d debian/kolabd/etc/postfix
install -m 640 debian/kolab-ldap*.cf debian/kolabd/etc/postfix/
- # kolab_smtpdpolicy config file
- install -m 644 debian/kolab_smtpdpolicy.conf debian/kolabd/etc/kolab/
-
# Man pages
mkdir -p debian/kolabd/usr/share/man/man1
for x in `find debian/kolabd/usr/bin debian/kolabd/usr/sbin -type f`; do \
More information about the pkg-kolab-devel
mailing list