summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@sfritsch.de>2012-03-14 23:41:27 +0100
committerStefan Fritsch <sf@sfritsch.de>2012-03-14 23:41:27 +0100
commit56fec846330a78c8c4e23d73531e12843cdf431b (patch)
tree86ca91445d7c5585e4d6d575dbe10e2747c60436
parentb508fbd5127c4ffbe7e68c9b2c98e78a7cd31ee5 (diff)
downloadapache2-56fec846330a78c8c4e23d73531e12843cdf431b.tar.gz
Treat old version of httpd.conf as unchanged
This version came with some 2.0.x package
-rwxr-xr-xdebian/apache2.postinst4
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 8219e0e3..7e5e9048 100755
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -298,7 +298,9 @@ move_httpd_conf()
if we_are_upgrading_from_squeeze $@ ; then
if [ -e /etc/apache2/httpd.conf ] && [ -f /etc/apache2/httpd.conf ] ; then
local md5sum="$(md5sum /etc/apache2/httpd.conf | sed -e 's/ .*//')"
- if [ $md5sum = "d41d8cd98f00b204e9800998ecf8427e" ] ; then
+ if [ $md5sum = "d41d8cd98f00b204e9800998ecf8427e" ] ||
+ [ $md5sum = "a20c3e53dd07836481a5e64bc71e1a33" ]
+ then
echo "Remove obsolete configuration file /etc/apache2/httpd.conf"
rm -f /etc/apache2/httpd.conf
else