Index: debian/postinst
===================================================================
--- debian/postinst	(.../ucs/services/univention-apache)	(Revision 11504)
+++ debian/postinst	(.../component/ipv6/univention-apache)	(Revision 13421)
@@ -46,6 +46,7 @@
 univention-config-registry set apache2/loglevel?"warn"
 univention-config-registry set apache2/startsite?"ucs-overview/de.html"
 univention-config-registry set apache2/documentroot?"/var/www/"
+univention-config-registry set apache2/ipv6?yes
 univention-config-registry set mail/alias/webmaster?root
 
 eval `univention-config-registry shell`
Index: debian/univention-apache.univention-config-registry
===================================================================
--- debian/univention-apache.univention-config-registry	(.../ucs/services/univention-apache)	(Revision 11504)
+++ debian/univention-apache.univention-config-registry	(.../component/ipv6/univention-apache)	(Revision 13421)
@@ -12,6 +12,7 @@
 Variables: domainname
 Variables: apache2/ssl/certificate
 Variables: apache2/ssl/key
+Variables: apache2/ipv6
 
 Type: module
 Module: extension.py
@@ -34,3 +35,4 @@
 
 Type: file
 File: etc/apache2/ports.conf
+Variables: apache2/ipv6
Index: debian/changelog
===================================================================
--- debian/changelog	(.../ucs/services/univention-apache)	(Revision 11504)
+++ debian/changelog	(.../component/ipv6/univention-apache)	(Revision 13421)
@@ -1,3 +1,9 @@
+univention-apache (3.1.0-1) unstable; urgency=low
+
+  * new UCR variable apache2/ipv6 switches IPv6 functionality on and off (Bug #15309)
+
+ -- Kai-Wilhelm Bolte <bolte@univention.de>  Tue, 25 Aug 2009 13:39:00 +0200
+
 univention-apache (3.0.4-1) unstable; urgency=low
 
   * add ucr-variable apache2/documentroot (Bug: #11789)
Index: debian/univention-apache.univention-config-registry-variables
===================================================================
--- debian/univention-apache.univention-config-registry-variables	(.../ucs/services/univention-apache)	(Revision 11504)
+++ debian/univention-apache.univention-config-registry-variables	(.../component/ipv6/univention-apache)	(Revision 13421)
@@ -39,3 +39,9 @@
 Description[en]=List of domainnames that shall be denied access by the proxy module (space separated)
 Type=str
 Categories=service-apache
+
+[apache2/ipv6]
+Description[de]=IPv6-Funktionalität des Webservers Ein- und Ausschalten
+Description[en]=Switches IPv6 functionality of webserver on and off
+Type=str
+Categories=service-apache
Index: conffiles/etc/apache2/mods-available/ssl.conf
===================================================================
--- conffiles/etc/apache2/mods-available/ssl.conf	(.../ucs/services/univention-apache)	(Revision 11504)
+++ conffiles/etc/apache2/mods-available/ssl.conf	(.../component/ipv6/univention-apache)	(Revision 13421)
@@ -1,6 +1,12 @@
 @%@BCWARNING=#@%@
 <IfModule mod_ssl.c>
-Listen 443
+@!@
+if configRegistry.get('apache2/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
+        print 'Listen 0.0.0.0:443'
+else:
+        print 'Listen 443'
+@!@
+
 #
 # Pseudo Random Number Generator (PRNG):
 # Configure one or more sources to seed the PRNG of the SSL library.
Index: conffiles/etc/apache2/ports.conf
===================================================================
--- conffiles/etc/apache2/ports.conf	(.../ucs/services/univention-apache)	(Revision 11504)
+++ conffiles/etc/apache2/ports.conf	(.../component/ipv6/univention-apache)	(Revision 13421)
@@ -1,2 +1,7 @@
 @%@BCWARNING=#@%@
-Listen 80
+@!@
+if configRegistry.get('apache2/ipv6', 'yes' ).lower() in ( 'no', 'false', '0' ):
+        print 'Listen 0.0.0.0:80'
+else:
+        print 'Listen 80'
+@!@