[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, master, updated. debian/2.2.22-3-13-g4a6bd73

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit d5dc56c2842e13b013ba397c95bde057e2ec1ff9
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon May 28 20:53:32 2012 +0200

    Don't create httpd.conf anymore
    
    ... and don't include it in apache2.conf.
    
    If it contains local modifications, move it to /etc/apache2/conf.d/httpd.conf
    
    Upgrade logic adjusted from 85f85e0c0897ceb2e3c6d1ce1e8fece033ae48ac by
    Arno.

diff --git a/debian/README.Debian b/debian/README.Debian
index c4a5337..5b77244 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -77,7 +77,9 @@ conf.d/
 
 httpd.conf
 
-	Empty file.
+	This file used to be included by apache2.conf. If it contained
+	local configuration it has been moved to conf.d/httpd.conf during
+	upgrade.
 
 magic
 
diff --git a/debian/apache2.2-common.postinst b/debian/apache2.2-common.postinst
index 8714e8b..76e920f 100644
--- a/debian/apache2.2-common.postinst
+++ b/debian/apache2.2-common.postinst
@@ -76,6 +76,21 @@ if dpkg --compare-versions "$2" lt 2.2.15-1~0; then
 	a2enmod -q reqtimeout
 fi
 
+if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.22-6~ ; then
+	if [ -e /etc/apache2/httpd.conf ] && [ -f /etc/apache2/httpd.conf ] ; then
+		md5sum="$(md5sum /etc/apache2/httpd.conf | sed -e 's/ .*//')"
+		if [ $md5sum = "d41d8cd98f00b204e9800998ecf8427e" ] ||
+		   [ $md5sum = "a20c3e53dd07836481a5e64bc71e1a33" ]
+		then
+			echo "Remove obsolete configuration file /etc/apache2/httpd.conf"
+			rm -f /etc/apache2/httpd.conf
+		elif [ -d /etc/apache2/conf.d/ ] && [ ! -f /etc/apache2/conf.d/httpd.conf ] ; then
+			echo "Detected legacy httpd.conf - moving file to /etc/apache2/conf.d/httpd.conf"
+			mv /etc/apache2/httpd.conf /etc/apache2/conf.d/httpd.conf
+		fi
+	fi
+fi
+
 # The definition of other_vhost_access.log has been moved.
 # Disable the new definition if the admin has changed the old
 # one (as determined by preinst).
@@ -89,7 +104,6 @@ rm -f /etc/apache2/ports.conf.dpkg-apache2.2-common.old
 rm -f /etc/default/apache2.dpkg-apache2.2-common.old
 rm -f /etc/apache2/conf.d/charset.dpkg-apache2.2-common.old
 
-[ -f /etc/apache2/httpd.conf ] || touch /etc/apache2/httpd.conf
 
 #DEBHELPER#
 
diff --git a/debian/apache2.2-common.postrm b/debian/apache2.2-common.postrm
index 25d50d1..ef65e77 100644
--- a/debian/apache2.2-common.postrm
+++ b/debian/apache2.2-common.postrm
@@ -27,6 +27,7 @@ fi
 
 if [ "$1" = purge -a "$DONT_PURGE" != 1 ] ; then
 	rm -f 	/etc/apache2/httpd.conf \
+		/etc/apache2/conf.d/httpd.conf \
 		/var/cache/apache2/reload \
 		/var/log/apache2/access.log* \
 		/var/log/apache2/other_vhosts_access.log* \
diff --git a/debian/changelog b/debian/changelog
index c6264b0..b1fdb31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,10 @@ apache2 (2.2.22-6) UNRELEASED; urgency=low
     directories. Closes: #548213
   * Update ssl default cipher config, add alternative speed optimized config.
     Closes: #649020
-  * Add "AddCharset" for .brf files in default mod_mime config. Closes: #402567
+  * Add "AddCharset" for .brf files in default mod_mime config.
+    Closes: #402567
+  * Don't create httpd.conf anymore and don't include it in apache2.conf. If
+    it contains local modifications, move it to /etc/apache2/conf.d/httpd.conf
 
  -- Stefan Fritsch <sf at debian.org>  Mon, 28 May 2012 20:02:19 +0200
 
diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index a3d6da1..d22f8cd 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -210,9 +210,6 @@ LogLevel warn
 Include mods-enabled/*.load
 Include mods-enabled/*.conf
 
-# Include all the user configurations:
-Include httpd.conf
-
 # Include ports listing
 Include ports.conf
 

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