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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit 26e6a9e40d88960c7dc4f7894c3cdfe143aa7222
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Apr 14 23:25:22 2012 +0200

    Re-add document root to vhost configs, update comment

diff --git a/debian/config-dir/sites-available/000-default.conf b/debian/config-dir/sites-available/000-default.conf
index f9ef27b..b907859 100644
--- a/debian/config-dir/sites-available/000-default.conf
+++ b/debian/config-dir/sites-available/000-default.conf
@@ -1,6 +1,8 @@
 <VirtualHost *:80>
 	ServerAdmin webmaster at localhost
 
+	DocumentRoot /var/www
+
 	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
 	# error, crit, alert, emerg.
 	# It is also possible to configure the loglevel for particular
diff --git a/debian/config-dir/sites-available/default-ssl.conf b/debian/config-dir/sites-available/default-ssl.conf
index a2fcff4..ceddda9 100644
--- a/debian/config-dir/sites-available/default-ssl.conf
+++ b/debian/config-dir/sites-available/default-ssl.conf
@@ -2,6 +2,8 @@
 <VirtualHost _default_:443>
 	ServerAdmin webmaster at localhost
 
+	DocumentRoot /var/www
+
 	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
 	# error, crit, alert, emerg.
 	# It is also possible to configure the loglevel for particular
@@ -11,9 +13,11 @@
 	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
 
 	#   SSL Engine Switch:

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