View | Details | Raw Unified | Return to bug 15308 | Differences between
and this patch

Collapse All | Expand All

(-)debian/univention-mail-cyrus-imap.postinst (+1 lines)
 Lines 33-35    Link Here 
33
univention-baseconfig set ldap/port?389
33
univention-baseconfig set ldap/port?389
34
univention-baseconfig set mail/cyrus/imap?yes
34
univention-baseconfig set mail/cyrus/imap?yes
35
univention-baseconfig set mail/cyrus/imap/lookup_groups?yes
35
univention-baseconfig set mail/cyrus/imap/lookup_groups?yes
36
univention-config-registry set mail/cyrus/ipv6?yes
(-)debian/changelog (+13 lines)
 Lines 1-3    Link Here 
1
univention-mail-cyrus (2.1.1-1) unstable; urgency=low
2
3
  * merged with trunk (Bug #15308)
4
5
 -- Kai-Wilhelm Bolte <bolte@univention.de>  Wed,  4 Nov 2009 17:01:06 +0100
6
7
univention-mail-cyrus (2.1.0-1) unstable; urgency=low
8
9
  *  new UCR variable mail/cyrus/ipv6 switches IPv6 functionality on and off
10
     (Bug #15308)
11
12
 -- Kai-Wilhelm Bolte <bolte@univention.de>  Wed, 26 Aug 2009 11:24:26 +0200
13
1
univention-mail-cyrus (2.0.4-1) unstable; urgency=low
14
univention-mail-cyrus (2.0.4-1) unstable; urgency=low
2
15
3
  * fixed wrong behaviour of univention-cyrus-set-quota if user's mail
16
  * fixed wrong behaviour of univention-cyrus-set-quota if user's mail
(-)debian/univention-mail-cyrus.univention-config-registry (+1 lines)
 Lines 16-21    Link Here 
16
Variables: mail/cyrus/imap/maxchilds
16
Variables: mail/cyrus/imap/maxchilds
17
Variables: mail/cyrus/pop/maxchilds
17
Variables: mail/cyrus/pop/maxchilds
18
Variables: mail/cyrus/sieve/maxchilds
18
Variables: mail/cyrus/sieve/maxchilds
19
Variables: mail/cyrus/ipv6
19
20
20
Type: file
21
Type: file
21
File: etc/init.d/cyrus21
22
File: etc/init.d/cyrus21
(-)debian/univention-mail-cyrus.univention-config-registry-variables (+6 lines)
 Lines 75-77    Link Here 
75
Description[en]=Controls whether cyrus 2.2 will be started upon system boot
75
Description[en]=Controls whether cyrus 2.2 will be started upon system boot
76
Type=str
76
Type=str
77
Categories=service-mail
77
Categories=service-mail
78
79
[mail/cyrus/ipv6]
80
Description[de]=IPv6-Funktionalität des IMAP-Servers Ein- und Ausschalten
81
Description[en]=Switches IPv6 functionality of IMAP server on and off
82
Type=str
83
Categories=service-mail
(-)conffiles/etc/cyrus.conf (-7 / +15 lines)
 Lines 36-55    Link Here 
36
	# --- Normal cyrus spool, or Murder backends ---
36
	# --- Normal cyrus spool, or Murder backends ---
37
	# add or remove based on preferences
37
	# add or remove based on preferences
38
@!@
38
@!@
39
if configRegistry.get('mail/cyrus/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
40
	proto = 'proto=tcp4'
41
else:
42
	proto = ''
39
if baseConfig.has_key('mail/cyrus/imap') and baseConfig['mail/cyrus/imap'] == 'yes':
43
if baseConfig.has_key('mail/cyrus/imap') and baseConfig['mail/cyrus/imap'] == 'yes':
40
	if baseConfig.has_key( 'mail/cyrus/imap/maxchilds' ):
44
	if baseConfig.has_key( 'mail/cyrus/imap/maxchilds' ):
41
		maxchild = baseConfig[ 'mail/cyrus/imap/maxchilds' ]
45
		maxchild = baseConfig[ 'mail/cyrus/imap/maxchilds' ]
42
	else:
46
	else:
43
		maxchild = '400'
47
		maxchild = '400'
44
	print '\timap		cmd="imapd -U 30" listen="imap" prefork=0 maxchild=%s' % maxchild
48
	print '\timap		cmd="imapd -U 30" listen="imap" prefork=0 maxchild=%s %s' % (maxchild, proto)
45
	print '\timaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=%s' % maxchild
49
	print '\timaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=%s %s' % (maxchild, proto)
46
if baseConfig.has_key('mail/cyrus/pop') and baseConfig['mail/cyrus/pop'] == 'yes':
50
if baseConfig.has_key('mail/cyrus/pop') and baseConfig['mail/cyrus/pop'] == 'yes':
47
	if baseConfig.has_key( 'mail/cyrus/pop/maxchilds' ):
51
	if baseConfig.has_key( 'mail/cyrus/pop/maxchilds' ):
48
		maxchild = baseConfig[ 'mail/cyrus/pop/maxchilds' ]
52
		maxchild = baseConfig[ 'mail/cyrus/pop/maxchilds' ]
49
	else:
53
	else:
50
		maxchild = '400'
54
		maxchild = '400'
51
	print '\tpop3		cmd="pop3d -U 30" listen="pop3" prefork=0 maxchild=%s' % maxchild
55
	print '\tpop3		cmd="pop3d -U 30" listen="pop3" prefork=0 maxchild=%s %s' % (maxchild, proto)
52
	print '\tpop3s		cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=%s' % maxchild
56
	print '\tpop3s		cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=%s %s' % (maxchild, proto)
53
@!@
57
@!@
54
58
55
	#nntp           cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100
59
	#nntp           cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100
 Lines 64-80    Link Here 
64
	# useful if you need to give users remote access to sieve
68
	# useful if you need to give users remote access to sieve
65
	# by default, we limit this to localhost in Debian
69
	# by default, we limit this to localhost in Debian
66
@!@
70
@!@
71
if configRegistry.get('mail/cyrus/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
72
        proto = 'proto=tcp4'
73
else:
74
        proto = ''
67
if baseConfig.has_key( 'mail/cyrus/sieve/maxchilds' ):
75
if baseConfig.has_key( 'mail/cyrus/sieve/maxchilds' ):
68
	maxchild = baseConfig[ 'mail/cyrus/sieve/maxchilds' ]
76
	maxchild = baseConfig[ 'mail/cyrus/sieve/maxchilds' ]
69
else:
77
else:
70
	maxchild = '400'
78
	maxchild = '400'
71
if baseConfig.has_key('mail/cyrus/sieve/listen_host') and baseConfig['mail/cyrus/sieve/listen_host']:
79
if baseConfig.has_key('mail/cyrus/sieve/listen_host') and baseConfig['mail/cyrus/sieve/listen_host']:
72
	if baseConfig['mail/cyrus/sieve/listen_host'] == "all":
80
	if baseConfig['mail/cyrus/sieve/listen_host'] == "all":
73
		print'  	sieve		cmd="timsieved" listen=":sieve" prefork=0 maxchild=%s' % maxchild
81
		print'  	sieve		cmd="timsieved" listen=":sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
74
	else:
82
	else:
75
		print'  	sieve		cmd="timsieved" listen="%s:sieve" prefork=0 maxchild=%s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild )
83
		print'  	sieve		cmd="timsieved" listen="%s:sieve" prefork=0 maxchild=%s %s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild, proto )
76
else:
84
else:
77
    print'  	sieve		cmd="timsieved" listen="localhost:sieve" prefork=0 maxchild=%s' % maxchild
85
    print'  	sieve		cmd="timsieved" listen="localhost:sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
78
@!@
86
@!@
79
	# this one is needed for the notification services
87
	# this one is needed for the notification services
80
	notify		cmd="notifyd" listen="/var/run/cyrus/socket/notify" proto="udp" prefork=1
88
	notify		cmd="notifyd" listen="/var/run/cyrus/socket/notify" proto="udp" prefork=1

Return to bug 15308