Attachment #1966 for bug #15308

Lines 68-73 Link Here

(-)debian/univention-mail-cyrus-kolab2.univention-config-registry (+2 lines)
68	Variables: mail/cyrus/pop/maxchilds	68	Variables: mail/cyrus/pop/maxchilds
69	Variables: mail/cyrus/sieve/listen_host	69	Variables: mail/cyrus/sieve/listen_host
70	Variables: mail/cyrus/sieve/maxchilds	70	Variables: mail/cyrus/sieve/maxchilds
		71	Variables: mail/cyrus/ipv6
71		72
72	Type: subfile	73	Type: subfile
73	Multifile: etc/imapd/cyrus.conf	74	Multifile: etc/imapd/cyrus.conf
Lines 95-100 Link Here
95	Variables: mail/cyrus/pop/maxchilds	96	Variables: mail/cyrus/pop/maxchilds
96	Variables: mail/cyrus/sieve/listen_host	97	Variables: mail/cyrus/sieve/listen_host
97	Variables: mail/cyrus/sieve/maxchilds	98	Variables: mail/cyrus/sieve/maxchilds
		99	Variables: mail/cyrus/ipv6
98		100
99	Type: subfile	101	Type: subfile
100	Multifile: etc/imapd/cyrus.conf	102	Multifile: etc/imapd/cyrus.conf

Lines 82-87 Link Here

(-)debian/univention-mail-cyrus-kolab2.univention-config-registry-variables (+6 lines)
82	Type=str	82	Type=str
83	Categories=service-mail	83	Categories=service-mail
84		84
		85	[mail/cyrus/ipv6]
		86	Description[de]=IPv6-Funktionalität des IMAP-Servers Ein- und Ausschalten
		87	Description[en]=Switches IPv6 functionality of IMAP server on and off
		88	Type=str
		89	Categories=service-mail
		90
85	[mail/cyrus/squatter/cron]	91	[mail/cyrus/squatter/cron]
86	Description[de]=Definiert den Intervall, in der Indexservice squatter Mails indiziert	92	Description[de]=Definiert den Intervall, in der Indexservice squatter Mails indiziert
87	Description[en]=Defines the interval to have the indexservice squatter process mails	93	Description[en]=Defines the interval to have the indexservice squatter process mails




univention-mail-cyrus-kolab2 (2.1.1-1) unstable; urgency=low

  * merged with trunk (Bug #15308)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu,  5 Nov 2009 09:28:32 +0100

univention-mail-cyrus-kolab2 (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>  Tue, 25 Aug 2009 16:13:50 +0200

univention-mail-cyrus-kolab2 (2.0.6-3) unstable; urgency=low

  * fixed cyrus services template (Bug: #16015) 

Lines 72-77 Link Here

(-)debian/univention-mail-cyrus-kolab2.postinst (+1 lines)
72	univention-config-registry set mail/cyrus/pop?yes	72	univention-config-registry set mail/cyrus/pop?yes
73	univention-config-registry set ldap/port=389	73	univention-config-registry set ldap/port=389
74	univention-config-registry set mail/cyrus/sieve/listen_host?all	74	univention-config-registry set mail/cyrus/sieve/listen_host?all
		75	univention-config-registry set mail/cyrus/ipv6?yes
75		76
76	dpkg-statoverride --add root sasl 660 /etc/sasldb2 \|\| true	77	dpkg-statoverride --add root sasl 660 /etc/sasldb2 \|\| true
77		78

Lines 15-20 Link Here

(-)conffiles/etc/imapd/cyrus.conf.d/20_SERVICES_spool (-10 / +17 lines)
15	else:	15	else:
16	frontend_emailId = "%s@%s" % ('.'.join([ baseConfig['hostname'], baseConfig.get('domainname','undefined') ]) , baseConfig.get('domainname','undefined'))	16	frontend_emailId = "%s@%s" % ('.'.join([ baseConfig['hostname'], baseConfig.get('domainname','undefined') ]) , baseConfig.get('domainname','undefined'))
17		17
		18	if configRegistry.get('mail/cyrus/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
		19	proto = 'proto=tcp4'
		20	else:
		21	proto = ''
		22
18	# If we run without a Cyrus Murder Master MUPDATE server	23	# If we run without a Cyrus Murder Master MUPDATE server
19	# or if we have registered as a 'kolab2' service provider (aka 'backend' or 'spool')	24	# or if we have registered as a 'kolab2' service provider (aka 'backend' or 'spool')
20	if not (baseConfig.has_key('mail/cyrus/murder/master') and baseConfig['mail/cyrus/murder/master'] != '') \	25	if not (baseConfig.has_key('mail/cyrus/murder/master') and baseConfig['mail/cyrus/murder/master'] != '') \
Lines 36-52 Link Here
36	else:	41	else:
37	maxchild = '400'	42	maxchild = '400'
38		43
39	print '\timap cmd="/usr/lib/cyrus/bin/imapd -C /etc/imapd/imapd.conf -U 30" listen="%simap" prefork=0 maxchild=%s' % (bindprefix, maxchild)	44
40	print '\timaps cmd="/usr/lib/cyrus/bin/imapd -C /etc/imapd/imapd.conf -s -U 30" listen="%simaps" prefork=0 maxchild=%s' % (bindprefix, maxchild)
41		45
		46	print '\timap cmd="/usr/lib/cyrus/bin/imapd -C /etc/imapd/imapd.conf -U 30" listen="%simap" prefork=0 maxchild=%s %s' % (bindprefix, maxchild, proto)
		47	print '\timaps cmd="/usr/lib/cyrus/bin/imapd -C /etc/imapd/imapd.conf -s -U 30" listen="%simaps" prefork=0 maxchild=%s %s' % (bindprefix, maxchild, proto)
		48
42	if baseConfig.has_key('mail/cyrus/pop') and baseConfig['mail/cyrus/pop'] == 'yes':	49	if baseConfig.has_key('mail/cyrus/pop') and baseConfig['mail/cyrus/pop'] == 'yes':
43	if baseConfig.has_key( 'mail/cyrus/pop/maxchilds' ):	50	if baseConfig.has_key( 'mail/cyrus/pop/maxchilds' ):
44	maxchild = baseConfig[ 'mail/cyrus/pop/maxchilds' ]	51	maxchild = baseConfig[ 'mail/cyrus/pop/maxchilds' ]
45	else:	52	else:
46	maxchild = '400'	53	maxchild = '400'
47		54
48	print '\tpop3 cmd="/usr/lib/cyrus/bin/pop3d -C /etc/imapd/imapd.conf -U 30" listen="%spop3" prefork=0 maxchild=%s' % (bindprefix, maxchild)	55	print '\tpop3 cmd="/usr/lib/cyrus/bin/pop3d -C /etc/imapd/imapd.conf -U 30" listen="%spop3" prefork=0 maxchild=%s %s' % (bindprefix, maxchild, proto)
49	print '\tpop3s cmd="/usr/lib/cyrus/bin/pop3d -C /etc/imapd/imapd.conf -s -U 30" listen="%spop3s" prefork=0 maxchild=%s' % (bindprefix, maxchild)	56	print '\tpop3s cmd="/usr/lib/cyrus/bin/pop3d -C /etc/imapd/imapd.conf -s -U 30" listen="%spop3s" prefork=0 maxchild=%s %s' % (bindprefix, maxchild, proto)
50		57
51	print'''	58	print'''
52	# At least one form of LMTP is required for delivery	59	# At least one form of LMTP is required for delivery
Lines 71-81 Link Here
71	maxchild = '400'	78	maxchild = '400'
72	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']:
73	if baseConfig['mail/cyrus/sieve/listen_host'] == "all":	80	if baseConfig['mail/cyrus/sieve/listen_host'] == "all":
74	print'\tsieve cmd="timsieved -C /etc/imapd/imapd.conf" listen=":sieve" prefork=0 maxchild=%s' % maxchild	81	print'\tsieve cmd="timsieved -C /etc/imapd/imapd.conf" listen=":sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
75	else:	82	else:
76	print'\tsieve cmd="timsieved -C /etc/imapd/imapd.conf" listen="%s:sieve" prefork=0 maxchild=%s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild )	83	print'\tsieve cmd="timsieved -C /etc/imapd/imapd.conf" listen="%s:sieve" prefork=0 maxchild=%s %s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild, proto )
77	else:	84	else:
78	print'\tsieve cmd="timsieved -C /etc/imapd/imapd.conf" listen="localhost:sieve" prefork=0 maxchild=%s' % maxchild	85	print'\tsieve cmd="timsieved -C /etc/imapd/imapd.conf" listen="localhost:sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
79		86
80	elif baseConfig.has_key('mail/cyrus/murder/frontends') and frontend_emailId in baseConfig['mail/cyrus/murder/frontends'].split(' '):	87	elif baseConfig.has_key('mail/cyrus/murder/frontends') and frontend_emailId in baseConfig['mail/cyrus/murder/frontends'].split(' '):
81	print'\n\t# useful if you need to give users remote access to sieve'	88	print'\n\t# useful if you need to give users remote access to sieve'
Lines 87-97 Link Here
87	maxchild = '400'	94	maxchild = '400'
88	if baseConfig.has_key('mail/cyrus/sieve/listen_host') and baseConfig['mail/cyrus/sieve/listen_host']:	95	if baseConfig.has_key('mail/cyrus/sieve/listen_host') and baseConfig['mail/cyrus/sieve/listen_host']:
89	if baseConfig['mail/cyrus/sieve/listen_host'] == "all":	96	if baseConfig['mail/cyrus/sieve/listen_host'] == "all":
90	print'\tsieve cmd="timsieved -C /etc/imapd/frontend.conf" listen=":sieve" prefork=0 maxchild=%s' % maxchild	97	print'\tsieve cmd="timsieved -C /etc/imapd/frontend.conf" listen=":sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
91	else:	98	else:
92	print'\tsieve cmd="timsieved -C /etc/imapd/frontend.conf" listen="%s:sieve" prefork=0 maxchild=%s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild )	99	print'\tsieve cmd="timsieved -C /etc/imapd/frontend.conf" listen="%s:sieve" prefork=0 maxchild=%s %s' % ( baseConfig['mail/cyrus/sieve/listen_host'], maxchild, proto )
93	else:	100	else:
94	print'\tsieve cmd="timsieved -C /etc/imapd/frontend.conf" listen="localhost:sieve" prefork=0 maxchild=%s' % maxchild	101	print'\tsieve cmd="timsieved -C /etc/imapd/frontend.conf" listen="localhost:sieve" prefork=0 maxchild=%s %s' % (maxchild, proto)
95	@!@	102	@!@
96		103
97	# this one is needed for the notification services	104	# this one is needed for the notification services

Return to bug 15308

Lines 1-3 Link Here

(-)debian/changelog (+13 lines)
		1	univention-mail-cyrus-kolab2 (2.1.1-1) unstable; urgency=low
		2
		3	* merged with trunk (Bug #15308)
		4
		5	-- Kai-Wilhelm Bolte <bolte@univention.de> Thu, 5 Nov 2009 09:28:32 +0100
		6
		7	univention-mail-cyrus-kolab2 (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> Tue, 25 Aug 2009 16:13:50 +0200
		13
1	univention-mail-cyrus-kolab2 (2.0.6-3) unstable; urgency=low	14	univention-mail-cyrus-kolab2 (2.0.6-3) unstable; urgency=low
2		15
3	* fixed cyrus services template (Bug: #16015)	16	* fixed cyrus services template (Bug: #16015)