[Pkg-apache-commits] r1010 - in /trunk/apache2: README.Debian changelog

[sf at alioth.debian.org]

Author: sf
Date: Wed Jul 29 15:56:10 2009
New Revision: 1010

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1010
Log:
Document in README.Debian how to name files in conf.d

Modified:
    trunk/apache2/README.Debian
    trunk/apache2/changelog

Modified: trunk/apache2/README.Debian
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/README.Debian?rev=1010&op=diff
==============================================================================
--- trunk/apache2/README.Debian (original)
+++ trunk/apache2/README.Debian Wed Jul 29 15:56:10 2009
@@ -61,7 +61,18 @@
 	Include /etc/apache2/conf.d
 
 	This is a good place to add additional configuration
-	directives.
+	directives. Packages should not use configuration
+	files that start with 'local-' or end with '.local'.
+	The local administrator can use these filenames to make
+	sure that there are no conflicts with files provided by
+	packages.
+
+	If the local administrator is not comfortable with packages
+	activating their config files by default, it is possible
+	to change the 'Include /etc/apache2/conf.d/' in apache2.conf
+	into 'Include /etc/apache2/conf.d.enabled/' and create that
+	directory. He can then put symlinks to the files in conf.d
+	which he wants to enable into conf.d.enabled.
 
 httpd.conf
 

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1010&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Wed Jul 29 15:56:10 2009
@@ -29,6 +29,8 @@
     (closes: #465393).
   * Clarify the recommended permissions for SSL certificates in README.Debian
     (closes: #512778).
+  * Document in README.Debian how to name files in conf.d to avoid conflicts
+    with packages (closes: #493252)
   * Remove 2.0 -> 2.2 upgrade logic from maintainer scripts.
   * Remove other_vhosts_access.log on package purge.