Attachment 1965 Details for Bug 15308

[patch] Patch: univention-mail-cyrus-2.1.1 für univention-mail-cyrus 2.0.4 aus trunk

univention-mail-cyrus-2.1.1.patch (text/plain), 5.28 KB, created by Kai Bolte on 2009-11-04 17:08 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Bolte

Created: 2009-11-04 17:08 CET

Size: 5.28 KB

patch

obsolete

>Index: debian/univention-mail-cyrus-imap.postinst
>===================================================================
>--- debian/univention-mail-cyrus-imap.postinst	(Revision 13442)
>+++ debian/univention-mail-cyrus-imap.postinst	(Arbeitskopie)
>@@ -33,3 +33,4 @@
> univention-baseconfig set ldap/port?389
> univention-baseconfig set mail/cyrus/imap?yes
> univention-baseconfig set mail/cyrus/imap/lookup_groups?yes
>+univention-config-registry set mail/cyrus/ipv6?yes
>Index: debian/changelog
>===================================================================
>--- debian/changelog	(Revision 13442)
>+++ debian/changelog	(Arbeitskopie)
>@@ -1,3 +1,16 @@
>+univention-mail-cyrus (2.1.1-1) unstable; urgency=low
>+
>+  * merged with trunk (Bug #15308)
>+
>+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Wed,  4 Nov 2009 17:01:06 +0100
>+
>+univention-mail-cyrus (2.1.0-1) unstable; urgency=low
>+
>+  *  new UCR variable mail/cyrus/ipv6 switches IPv6 functionality on and off
>+     (Bug #15308)
>+
>+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Wed, 26 Aug 2009 11:24:26 +0200
>+
> univention-mail-cyrus (2.0.4-1) unstable; urgency=low
> 
>   * fixed wrong behaviour of univention-cyrus-set-quota if user's mail
>Index: debian/univention-mail-cyrus.univention-config-registry
>===================================================================
>--- debian/univention-mail-cyrus.univention-config-registry	(Revision 13442)
>+++ debian/univention-mail-cyrus.univention-config-registry	(Arbeitskopie)
>@@ -16,6 +16,7 @@
> Variables: mail/cyrus/imap/maxchilds
> Variables: mail/cyrus/pop/maxchilds
> Variables: mail/cyrus/sieve/maxchilds
>+Variables: mail/cyrus/ipv6
> 
> Type: file
> File: etc/init.d/cyrus21
>Index: debian/univention-mail-cyrus.univention-config-registry-variables
>===================================================================
>--- debian/univention-mail-cyrus.univention-config-registry-variables	(Revision 13442)
>+++ debian/univention-mail-cyrus.univention-config-registry-variables	(Arbeitskopie)
>@@ -75,3 +75,9 @@
> Description[en]=Controls whether cyrus 2.2 will be started upon system boot
> Type=str
> Categories=service-mail
>+
>+[mail/cyrus/ipv6]
>+Description[de]=IPv6-FunktionalitÃ¤t des IMAP-Servers Ein- und Ausschalten
>+Description[en]=Switches IPv6 functionality of IMAP server on and off
>+Type=str
>+Categories=service-mail
>Index: conffiles/etc/cyrus.conf
>===================================================================
>--- conffiles/etc/cyrus.conf	(Revision 13442)
>+++ conffiles/etc/cyrus.conf	(Arbeitskopie)
>@@ -36,20 +36,24 @@
> 	# --- Normal cyrus spool, or Murder backends ---
> 	# add or remove based on preferences
> @!@
>+if configRegistry.get('mail/cyrus/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
>+	proto = 'proto=tcp4'
>+else:
>+	proto = ''
> if baseConfig.has_key('mail/cyrus/imap') and baseConfig['mail/cyrus/imap'] == 'yes':
> 	if baseConfig.has_key( 'mail/cyrus/imap/maxchilds' ):
> 		maxchild = baseConfig[ 'mail/cyrus/imap/maxchilds' ]
> 	else:
> 		maxchild = '400'
>-	print '\timap		cmd="imapd -U 30" listen="imap" prefork=0 maxchild=%s' % maxchild
>-	print '\timaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=%s' % maxchild
>+	print '\timap		cmd="imapd -U 30" listen="imap" prefork=0 maxchild=%s %s' % (maxchild, proto)
>+	print '\timaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=%s %s' % (maxchild, proto)
> if baseConfig.has_key('mail/cyrus/pop') and baseConfig['mail/cyrus/pop'] == 'yes':
> 	if baseConfig.has_key( 'mail/cyrus/pop/maxchilds' ):
> 		maxchild = baseConfig[ 'mail/cyrus/pop/maxchilds' ]
> 	else:
> 		maxchild = '400'
>-	print '\tpop3		cmd="pop3d -U 30" listen="pop3" prefork=0 maxchild=%s' % maxchild
>-	print '\tpop3s		cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=%s' % maxchild
>+	print '\tpop3		cmd="pop3d -U 30" listen="pop3" prefork=0 maxchild=%s %s' % (maxchild, proto)
>+	print '\tpop3s		cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=%s %s' % (maxchild, proto)
> @!@
> 
> 	#nntp           cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100
>@@ -64,17 +68,21 @@
> 	# useful if you need to give users remote access to sieve
> 	# by default, we limit this to localhost in Debian
> @!@
>+if configRegistry.get('mail/cyrus/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
>+        proto = 'proto=tcp4'
>+else:
>+        proto = ''
> if baseConfig.has_key( 'mail/cyrus/sieve/maxchilds' ):
> 	maxchild = baseConfig[ 'mail/cyrus/sieve/maxchilds' ]
> else:
> 	maxchild = '400'
> if baseConfig.has_key('mail/cyrus/sieve/listen_host') and baseConfig['mail/cyrus/sieve/listen_host']:
> 	if baseConfig['mail/cyrus/sieve/listen_host'] == "all":
>-		print'  	sieve		cmd="timsieved" listen=":sieve" prefork=0 maxchild=%s' % maxchild
>+		print'  	sieve		cmd="timsieved" listen=":sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
> 	else:
>-		print'  	sieve		cmd="timsieved" listen="%s:sieve" prefork=0 maxchild=%s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild )
>+		print'  	sieve		cmd="timsieved" listen="%s:sieve" prefork=0 maxchild=%s %s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild, proto )
> else:
>-    print'  	sieve		cmd="timsieved" listen="localhost:sieve" prefork=0 maxchild=%s' % maxchild
>+    print'  	sieve		cmd="timsieved" listen="localhost:sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
> @!@
> 	# this one is needed for the notification services
> 	notify		cmd="notifyd" listen="/var/run/cyrus/socket/notify" proto="udp" prefork=1

Actions: View | Diff

Attachments on bug 15308: 1965 | 1966