[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 3dfe602149f3c7450c0e3094ba5b6cd7721802a9

[Arno Töll]

The following commit has been merged in the next branch:
commit 3dfe602149f3c7450c0e3094ba5b6cd7721802a9
Author: Arno Töll <arno at debian.org>
Date:   Sat Apr 14 23:05:18 2012 +0200

    Give a few configuration hints of site-local configuration files

diff --git a/debian/apache2.README.Debian b/debian/apache2.README.Debian
index 47f2d7b..9e43aa0 100644
--- a/debian/apache2.README.Debian
+++ b/debian/apache2.README.Debian
@@ -147,6 +147,23 @@ sites-enabled/
 The Include directives ignore files with names that do not end with a
 .conf suffix. This behavior changed to previous releases!
 
+In some cases you may want to enable a specific piece of configuration
+(think of files shipped in conf-available/) for a particular virtual
+host only and not globally as our default is. In such cases you can
+disable the configuration at a global scope for example by doing
+
+	a2disconf some-configuration
+
+Then it can be included it in a particular virtual host within a file in
+sites-enabled/. You may want to add
+
+	Include conf-available/some-configuration.conf
+
+in that site configuration. However, be careful as this may not work for
+some configurations, depending on the context and implications of some
+directives.
+
+
 Other files
 -----------
 
diff --git a/debian/config-dir/sites-available/000-default.conf b/debian/config-dir/sites-available/000-default.conf
index 1326408..f9ef27b 100644
--- a/debian/config-dir/sites-available/000-default.conf
+++ b/debian/config-dir/sites-available/000-default.conf
@@ -10,8 +10,10 @@
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-	# For most config files from conf-available, it is possible to
-	# include the file only for some vhosts while having it disabled
-	# globally. For example:
+	# For most configuration files from conf-available/, which are
+	# enabled or disabled at a global level, it is possible to
+	# include a it only for a particular virtual host. For example the
+	# following line enables the CGI configuration for this host
+	# only after disabling it globally with "a2disconf".
 	#Include conf-available/usr-lib-cgi-bin.conf
 </VirtualHost>

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)