Attachment #1958 for bug #15309

View | Details | Raw Unified | Return to bug 15309
Collapse All | Expand All

Lines 46-51 Link Here

(-)debian/postinst (+1 lines)
46	univention-config-registry set apache2/loglevel?"warn"	46	univention-config-registry set apache2/loglevel?"warn"
47	univention-config-registry set apache2/startsite?"ucs-overview/de.html"	47	univention-config-registry set apache2/startsite?"ucs-overview/de.html"
48	univention-config-registry set apache2/documentroot?"/var/www/"	48	univention-config-registry set apache2/documentroot?"/var/www/"
		49	univention-config-registry set apache2/ipv6?yes
49	univention-config-registry set mail/alias/webmaster?root	50	univention-config-registry set mail/alias/webmaster?root
50		51
51	eval `univention-config-registry shell`	52	eval `univention-config-registry shell`

Lines 12-17 Link Here

(-)debian/univention-apache.univention-config-registry (+2 lines)
12	Variables: domainname	12	Variables: domainname
13	Variables: apache2/ssl/certificate	13	Variables: apache2/ssl/certificate
14	Variables: apache2/ssl/key	14	Variables: apache2/ssl/key
		15	Variables: apache2/ipv6
15		16
16	Type: module	17	Type: module
17	Module: extension.py	18	Module: extension.py
Lines 34-36 Link Here
34		35
35	Type: file	36	Type: file
36	File: etc/apache2/ports.conf	37	File: etc/apache2/ports.conf
		38	Variables: apache2/ipv6

Lines 1-3 Link Here

(-)debian/changelog (+6 lines)
		1	univention-apache (3.1.0-1) unstable; urgency=low
		2
		3	* new UCR variable apache2/ipv6 switches IPv6 functionality on and off (Bug #15309)
		4
		5	-- Kai-Wilhelm Bolte <bolte@univention.de> Tue, 25 Aug 2009 13:39:00 +0200
		6
1	univention-apache (3.0.4-1) unstable; urgency=low	7	univention-apache (3.0.4-1) unstable; urgency=low
2		8
3	* add ucr-variable apache2/documentroot (Bug: #11789)	9	* add ucr-variable apache2/documentroot (Bug: #11789)

Lines 39-41 Link Here

(-)debian/univention-apache.univention-config-registry-variables (+6 lines)
39	Description[en]=List of domainnames that shall be denied access by the proxy module (space separated)	39	Description[en]=List of domainnames that shall be denied access by the proxy module (space separated)
40	Type=str	40	Type=str
41	Categories=service-apache	41	Categories=service-apache
		42
		43	[apache2/ipv6]
		44	Description[de]=IPv6-Funktionalität des Webservers Ein- und Ausschalten
		45	Description[en]=Switches IPv6 functionality of webserver on and off
		46	Type=str
		47	Categories=service-apache

Lines 1-6 Link Here

(-)conffiles/etc/apache2/mods-available/ssl.conf (-1 / +7 lines)
1	@%@BCWARNING=#@%@	1	@%@BCWARNING=#@%@
2	<IfModule mod_ssl.c>	2	<IfModule mod_ssl.c>
3	Listen 443	3	@!@
		4	if configRegistry.get('apache2/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
		5	print 'Listen 0.0.0.0:443'
		6	else:
		7	print 'Listen 443'
		8	@!@
		9
4	#	10	#
5	# Pseudo Random Number Generator (PRNG):	11	# Pseudo Random Number Generator (PRNG):
6	# Configure one or more sources to seed the PRNG of the SSL library.	12	# Configure one or more sources to seed the PRNG of the SSL library.

Lines 1-2 Link Here

(-)conffiles/etc/apache2/ports.conf (-1 / +6 lines)
1	@%@BCWARNING=#@%@	1	@%@BCWARNING=#@%@
2	Listen 80	2	@!@
		3	if configRegistry.get('apache2/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
		4	print 'Listen 0.0.0.0:80'
		5	else:
		6	print 'Listen 80'
		7	@!@

Return to bug 15309