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

[Stefan Fritsch]

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

    * Move the configuration of /usr/lib/cgi-bin into a separate config file.
    * Comment out per-vhost loglevel.
    * Update comments and re-arrange directives in in vhost configs.

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index ec7b8ce..1b57d10 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -221,6 +221,10 @@ enable_default_conf()
 			a2enconf -m -q $conf
 		done
 	fi
+	# This catches upgrades and new installs
+	if ! dpkg --compare-versions "$2" ge 2.4.1-4 ; then
+		a2enconf -m -q usr-lib-cgi-bin
+	fi
 }
 
 install_default_site()
diff --git a/debian/changelog b/debian/changelog
index 49c2eed..c37ad62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apache2 (2.4.1-5) experimental; urgency=low
+apache2 (2.4.1-4) experimental; urgency=low
 
   [ Arno Töll ]
   * NOT RELEASED YET
@@ -25,6 +25,8 @@ apache2 (2.4.1-5) experimental; urgency=low
   * Disable MultiViews in the default config.
   * Update ssl default cipher config, add alternative speed optimized config.
     Closes: #649020
+  * Move the configuration of /usr/lib/cgi-bin into a separate config file.
+  * Comment out per-vhost loglevel.
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 14 Apr 2012 21:07:50 +0200
 
diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index dfc7b44..eb808fb 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -134,8 +134,10 @@ ErrorLog ${APACHE_LOG_DIR}/error.log
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
+# Available values: trace8, ..., trace1, debug, info, notice, warn,
+# error, crit, alert, emerg.
+# It is also possible to configure the log level for particular modules, e.g.
+# "LogLevel info ssl:warn"
 #
 LogLevel warn
 
diff --git a/debian/config-dir/conf-available/usr-lib-cgi-bin.conf b/debian/config-dir/conf-available/usr-lib-cgi-bin.conf
new file mode 100644
index 0000000..8c3dcde
--- /dev/null
+++ b/debian/config-dir/conf-available/usr-lib-cgi-bin.conf
@@ -0,0 +1,17 @@
+<IfModule mod_alias.c>
+	<IfModule mod_cgi.c>
+		Define ENALBLE_USR_LIB_CGI_BIN
+	</IfModule>
+	<IfModule mod_cgid.c>
+		Define ENALBLE_USR_LIB_CGI_BIN
+	</IfModule>
+
+	<IfDefine ENALBLE_USR_LIB_CGI_BIN>
+		ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+		<Directory "/usr/lib/cgi-bin">
+			AllowOverride None
+			Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+			Require all granted
+		</Directory>
+	</IfDefine>
+</IfModule>
diff --git a/debian/config-dir/sites-available/000-default.conf b/debian/config-dir/sites-available/000-default.conf
index 6833f8c..0d37ba3 100644
--- a/debian/config-dir/sites-available/000-default.conf
+++ b/debian/config-dir/sites-available/000-default.conf
@@ -1,18 +1,17 @@
 <VirtualHost *:80>
 	ServerAdmin webmaster at localhost
 
-	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-	<Directory "/usr/lib/cgi-bin">
-		AllowOverride None
-		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		Require all granted
-	</Directory>
+	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
+	# error, crit, alert, emerg.
+	# It is also possible to configure the loglevel for particular
+	# modules, e.g.
+	#LogLevel info ssl:warn
 
 	ErrorLog ${APACHE_LOG_DIR}/error.log
-
-	# Possible values include: debug, info, notice, warn, error, crit,
-	# alert, emerg.
-	LogLevel warn
-
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+	# You can include here config files from conf-available that you
+	# have disabled globally and want to enable for some vhosts. For
+	# example:
+	#Include conf-available/usr-lib-cgi-bin.conf
 </VirtualHost>
diff --git a/debian/config-dir/sites-available/default-ssl.conf b/debian/config-dir/sites-available/default-ssl.conf
index 3959ea3..284459a 100644
--- a/debian/config-dir/sites-available/default-ssl.conf
+++ b/debian/config-dir/sites-available/default-ssl.conf
@@ -2,20 +2,20 @@
 <VirtualHost _default_:443>
 	ServerAdmin webmaster at localhost
 
-	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-	<Directory "/usr/lib/cgi-bin">
-		AllowOverride None
-		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		Require all granted
-	</Directory>
+	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
+	# error, crit, alert, emerg.
+	# It is also possible to configure the loglevel for particular
+	# modules, e.g.
+	#LogLevel info ssl:warn
 
 	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-	# Possible values include: debug, info, notice, warn, error, crit,
-	# alert, emerg.
-	LogLevel warn
+	# You can include here config files from conf-available that you
+	# have disabled globally and want to enable for some vhosts. For
+	# example:
+	#Include conf-available/usr-lib-cgi-bin.conf
 
-	CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
 
 	#   SSL Engine Switch:
 	#   Enable/Disable SSL for this virtual host.

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