* 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.

4 files changed, 41 insertions, 23 deletions

diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index dfc7b44e..eb808fb8 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 00000000..8c3dcde2
--- /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 6833f8cb..0d37ba31 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@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 3959ea37..284459a8 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@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.