Index: dist/2.0/init/apache2.confd
===================================================================
--- dist/2.0/init/apache2.confd (revision 44)
+++ dist/2.0/init/apache2.confd (working copy)
@@ -4,20 +4,24 @@
# Config file for /etc/init.d/apache2
-# An example from /etc/apache2/modules.d/40_mod_ssl.conf:
-#
-# <IfDefine SSL>
-# <IfModule !mod_ssl.c>
-# LoadModule ssl_module extramodules/mod_ssl.so
-# </IfModule>
-# </IfDefine>
-#
-# This means that the mod_ssl.so DSO module is only loaded
-# into the server when you pass "-D SSL" at startup. To
-# enable WebDAV, add "-D DAV -D DAV_FS". If you installed
-# mod_php then add "-D PHP4". For more options, please
-# read the files in the /etc/apache2/modules.d directory.
-#APACHE2_OPTS="-D SSL"
+# When you install a module it is easy to activate or deactivate the modules
+# and other features of apache using the APACHE2_OPTS line. Every module should
+# install a configuartion in /etc/apache2/modules.d. In that file will be an
+# <IfDefine NNN> where NNN is the option to enable that module.
+# Here are the options available in the default configuration:
+# USERDIR Enables /~username mapping to /home/username/public_html
+# INFO Enables mod_info, a useful module for debugging
+# PROXY Enables mod_proxy
+# DAV Enables mod_dav
+# DAV_FS Enables mod_dav_fs (you should enable this when you enable DAV
+# unless you know what you are doing)
+# SSL Enables SSL
+# SSL_DEFAULT_VHOST Enables default vhost for SSL (you should enable this
+# when you enable SSL unless you know what you are doing)
+# LDAP Enables mod_ldap
+# AUTH_LDAP Enables authentication through mod_ldap
+# DEFAULT_VHOST Enables the default virtual host in /var/www/localhost/htdocs
+APACHE2_OPTS="-D DEFAULT_VHOST"
# Extended options for advanced uses of Apache ONLY
# You don't need to edit these unless you are doing crazy Apache stuff
Index: dist/2.0/conf/vhosts.d/00_default_vhost.conf
===================================================================
--- dist/2.0/conf/vhosts.d/00_default_vhost.conf (revision 44)
+++ dist/2.0/conf/vhosts.d/00_default_vhost.conf (working copy)
@@ -37,6 +37,8 @@
# This means any requests that do not match any other vhosts will
# goto this virtual host.
#
+
+<IfDefine DEFAULT_VHOST>
<VirtualHost *:80>
#
# DocumentRoot: The directory out of which you will serve your
@@ -87,3 +89,4 @@
MaxProcessors 20
</IfModule>
</VirtualHost>
+</IfDefine>
Index: dist/2.0/conf/modules.d/41_mod_ssl.default-vhost.conf
===================================================================
--- dist/2.0/conf/modules.d/41_mod_ssl.default-vhost.conf (revision 44)
+++ dist/2.0/conf/modules.d/41_mod_ssl.default-vhost.conf (working copy)
@@ -1,9 +1,9 @@
<IfDefine SSL>
- <IfModule !mod_ssl.c>
- LoadModule ssl_module modules/mod_ssl.so
- </IfModule>
-</IfDefine>
+ # We now wrap the entire default vhost in a seperate IfDefine to fix bug
+ # 100624. If you are using this default vhost, add it to /etc/conf.d/apache2
+ <IfDefine SSL_DEFAULT_VHOST>
+
<IfModule mod_ssl.c>
##
## SSL Virtual Host Context
@@ -185,3 +185,6 @@
</VirtualHost>
</IfModule>
+
+ </IfDefine>
+</IfDefine>