fix #193295, #193354, #192179

1 files changed, 27 insertions, 21 deletions

diff --git a/2.2/init/apache2.confd b/2.2/init/apache2.confd
index a331643..dbe5a6e 100644
--- a/2.2/init/apache2.confd
+++ b/2.2/init/apache2.confd
@@ -2,30 +2,36 @@
 
 # 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 configuration in /etc/apache2/modules.d. In that file will be an
-# <IfDefine NNN> where NNN is the option to enable that module.
+# install a configuration in /etc/apache2/modules.d. In that file will have an
+# <IfDefine NNN> directive where NNN is the option to enable that module.
+#
 # Here are the options available in the default configuration:
 #
-#  CACHE      Enables mod_cache
-#  MEM_CACHE  Enables default configuration mod_mem_cache
-#  DAV        Enables mod_dav
-#  DEFAULT_VHOST   Enables name-based virtual hosts, with the default
-#                  virtual host being in /var/www/localhost/htdocs
-#  ERRORDOCS  Enables default error documents for many languages.
-#  INFO       Enables mod_info, a useful module for debugging
-#  LANGUAGE   Enables content-negotiation based on language and charset.
-#  LDAP       Enables mod_ldap (available if USE=ldap)
-#  AUTH_LDAP  Enables authentication through mod_ldap (available if USE=ldap)
-#  MANUAL     Enables /manual/ to be the apache manual (available if USE=docs)
-#  PROXY      Enables mod_proxy
-#  SSL        Enables SSL (available if USE=ssl)
-#  SSL_DEFAULT_VHOST   Enables default vhost for SSL (you should enable this
-#                      when you enable SSL unless you know what you are doing)
-#  SUEXEC     Enables running CGI scripts (in USERDIR) through suexec.
-#  USERDIR    Enables /~username mapping to /home/username/public_html
+#  AUTH_DIGEST  Enables mod_auth_digest
+#  AUTHNZ_LDAP  Enables authentication through mod_ldap (available if USE=ldap)
+#  CACHE        Enables mod_cache
+#  DAV          Enables mod_dav
+#  ERRORDOCS    Enables default error documents for many languages.
+#  INFO         Enables mod_info, a useful module for debugging
+#  LANGUAGE     Enables content-negotiation based on language and charset.
+#  LDAP         Enables mod_ldap (available if USE=ldap)
+#  MANUAL       Enables /manual/ to be the apache manual (available if USE=docs)
+#  MEM_CACHE    Enables default configuration mod_mem_cache
+#  PROXY        Enables mod_proxy
+#  SSL          Enables SSL (available if USE=ssl)
+#  SUEXEC       Enables running CGI scripts (in USERDIR) through suexec.
+#  USERDIR      Enables /~username mapping to /home/username/public_html
+#
+#
+# The following two options provide the default virtual host for the HTTP and
+# HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache
+# will not listen for incomming connections on the approriate port.
+#
+#  DEFAULT_VHOST      Enables name-based virtual hosts, with the default
+#                     virtual host being in /var/www/localhost/htdocs
+#  SSL_DEFAULT_VHOST  Enables default vhost for SSL (you should enable this
+#                     when you enable SSL)
 #
-# Warning: You need one of DEFAULT_VHOST or SSL_DEFAULT_VHOST, otherwise apache
-#          will not listen for incomming connections on any port.
 APACHE2_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO"
 
 # Extended options for advanced uses of Apache ONLY