* rename usr-lib-cgi-bin.conf -> that sounds hopefully a bit more helpful

* Remove comments from apache2.conf, we're done with it
* Synchronize comments in 000-default.conf and default-ssl.conf
* Provide httpd and httpd-cgi virtual packages again

4 files changed, 8 insertions, 10 deletions

diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index b0e2a807..4c8d9597 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -50,9 +50,6 @@
 #   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
 #   work with the default configuration.
 
-# TODO: Triage the following bugs involving conf changes:
-#	#340947 [w|  |  ] [apache2.2-common] apache2-common: standard path to virtual host document roots under /var/www?
-
 
 # Global configuration
 #
diff --git a/debian/config-dir/conf-available/usr-lib-cgi-bin.conf b/debian/config-dir/conf-available/serve-cgi-bin.conf
index 8c3dcde2..8c3dcde2 100644
--- a/debian/config-dir/conf-available/usr-lib-cgi-bin.conf
+++ b/debian/config-dir/conf-available/serve-cgi-bin.conf
diff --git a/debian/config-dir/sites-available/000-default.conf b/debian/config-dir/sites-available/000-default.conf
index b9078598..decfca53 100644
--- a/debian/config-dir/sites-available/000-default.conf
+++ b/debian/config-dir/sites-available/000-default.conf
@@ -17,5 +17,5 @@
 	# 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
+	#Include conf-available/serve-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 ceddda9e..850f1e0b 100644
--- a/debian/config-dir/sites-available/default-ssl.conf
+++ b/debian/config-dir/sites-available/default-ssl.conf
@@ -13,12 +13,13 @@
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-	# 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
+
+        # 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/serve-cgi-bin.conf
 
 	#   SSL Engine Switch:
 	#   Enable/Disable SSL for this virtual host.