From: Paul Wise <pabs@debian.org>
Date: Sun, 31 May 2015 06:34:33 +0000 (+0800)
Subject: Allow updating foo when foo and foo.conf both exist
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=c36b3eca9a0eab6df074eeaf5c4d5da26cb6166a;p=dsa-metapackages.git

Allow updating foo when foo and foo.conf both exist
---

diff --git a/apache2-vhost-update b/apache2-vhost-update
index cf5b1db..2c283a3 100755
--- a/apache2-vhost-update
+++ b/apache2-vhost-update
@@ -91,7 +91,7 @@ if echo "$site" | grep /; then
 	exit 1
 fi
 
-if [ -f "$STAGINGDIR/$site.conf" ] ; then
+if [ -f "$STAGINGDIR/$site.conf" -a ! -f "$STAGINGDIR/$site" ] ; then
 	site="$site.conf"
 fi