4 commits - ucs/conffiles ucs/debian ucs/kolab-ucs-join-script.sh ucs/kolab-ucs-ldap.acl

Christoph Wickert wickert at kolabsys.com
Tue Mar 10 13:32:55 CET 2015


 ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool |    2 -
 ucs/debian/kolab-ucs.dirs                        |    3 --
 ucs/debian/kolab-ucs.install                     |    1 
 ucs/kolab-ucs-join-script.sh                     |    6 ++---
 ucs/kolab-ucs-ldap.acl                           |   24 +++++++++++++++++++++++
 5 files changed, 30 insertions(+), 6 deletions(-)

New commits:
commit 89f6aa165cd4342faab6042747bf7f4b97a94fb9
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Mar 10 13:32:50 2015 +0100

    Fix sieve port (#4821)

diff --git a/ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool b/ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool
index 2aab7b2..eaa792f 100644
--- a/ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool
+++ b/ucs/conffiles/etc/cyrus.conf.d/20_SERVICES_spool
@@ -71,7 +71,7 @@ if not (configRegistry.has_key('mail/cyrus/murder/master') and configRegistry['m
 		maxchild = '400'
 	if configRegistry.has_key('mail/cyrus/sieve/listen_host') and configRegistry['mail/cyrus/sieve/listen_host']:
 		if configRegistry['mail/cyrus/sieve/listen_host'] == "all":
-			print'\tsieve		cmd="timsieved" listen=":sieve" prefork=0 maxchild=%s' % maxchild
+			print'\tsieve		cmd="timsieved" listen="sieve" prefork=0 maxchild=%s' % maxchild
 		else:
 			print'\tsieve		cmd="timsieved" listen="%s:sieve" prefork=0 maxchild=%s' % ( configRegistry['mail/cyrus/sieve/listen_host'], maxchild )
 	else:


commit ef19535c3e5a1a366eb148b419aec529d055d2c3
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Feb 27 16:35:55 2015 +0100

    Add and install kolab-ucs-ldap.acl (#4350)

diff --git a/ucs/debian/kolab-ucs.dirs b/ucs/debian/kolab-ucs.dirs
index ea86a97..8bb565e 100644
--- a/ucs/debian/kolab-ucs.dirs
+++ b/ucs/debian/kolab-ucs.dirs
@@ -1 +1,2 @@
 usr/lib/univention-install/
+usr/share/doc/kolab-schema/
diff --git a/ucs/debian/kolab-ucs.install b/ucs/debian/kolab-ucs.install
index c71dda1..dbfca12 100644
--- a/ucs/debian/kolab-ucs.install
+++ b/ucs/debian/kolab-ucs.install
@@ -1 +1,2 @@
 65kolab-ucs.inst /usr/lib/univention-install
+univention-kolab3.acl /usr/share/doc/kolab-schema
diff --git a/ucs/kolab-ucs-ldap.acl b/ucs/kolab-ucs-ldap.acl
new file mode 100644
index 0000000..4b99a69
--- /dev/null
+++ b/ucs/kolab-ucs-ldap.acl
@@ -0,0 +1,24 @@
+@!@
+ldap_base=configRegistry.get('ldap/base')
+
+attrs = [
+	'kolabDelegate',
+	'kolabForwardAddress',
+	'kolabForwardKeepCopy',
+	'kolabForwardUCE',
+	'kolabVacationAddress',
+	'kolabVacationReactDomain',
+	'kolabVacationReplyToUCE',
+	'kolabVacationResendInterval',
+	'univentionKolabForwardActive',
+	'univentionKolabVacationText',
+	'univentionKolabVacationNoReactDomain',
+	'univentionKolabDeliveryToFolderName',
+	'univentionKolabDeliveryToFolderActive',
+]
+
+print 'access to dn.sub="%(ldap_base)s" attrs="%(attrs)s"' % {'ldap_base': ldap_base, 'attrs': ','.join(attrs) }
+print '    by self write'
+print '    by * none break'
+
+@!@


commit d239e364a334eafd1532c9c87239622e3a5a691c
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Feb 27 16:24:26 2015 +0100

    Remove empty dirs that used to hold kolab-ucs-passwd-change.sh

diff --git a/ucs/debian/kolab-ucs.dirs b/ucs/debian/kolab-ucs.dirs
index 25192df..ea86a97 100644
--- a/ucs/debian/kolab-ucs.dirs
+++ b/ucs/debian/kolab-ucs.dirs
@@ -1,3 +1 @@
 usr/lib/univention-install/
-usr/lib/univention-server/
-usr/lib/univention-server/server_password_change.d/


commit 62a4a37d8c8f07b510922af596cff50ae944e656
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Fri Feb 27 16:20:21 2015 +0100

    Fix paths to LDAP schema extensions in kolab-ucs-join-script.sh

diff --git a/ucs/kolab-ucs-join-script.sh b/ucs/kolab-ucs-join-script.sh
index 38d401b..0a38594 100755
--- a/ucs/kolab-ucs-join-script.sh
+++ b/ucs/kolab-ucs-join-script.sh
@@ -33,11 +33,11 @@ ucs_addServiceToLocalhost "kolab" "$@"
 
 # Register LDAP schema extensions
 ucs_registerLDAPExtension "$@" \
-	--schema /usr/share/kolab/kolab3.schema
+	--schema /usr/share/doc/kolab-schema/kolab3.schema
 ucs_registerLDAPExtension "$@" \
-	--schema /usr/share/kolab/univention-kolab3-wrapper.schema
+	--schema /usr/share/doc/kolab-schema/univention-kolab3-wrapper.schema
 ucs_registerLDAPExtension "$@" \
-	--acl /usr/share/kolab/univention-kolab3.acl
+	--acl /usr/share/doc/kolab-schema/univention-kolab3.acl
 
 # If there is no default kolab home server ...
 kolab_home=$(udm settings/default list "$@"




More information about the commits mailing list