From: Paul Wise <pabs@debian.org>
Date: Sun, 31 May 2015 01:47:09 +0000 (+0800)
Subject: Allow vhost site names without .conf at the end
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dsa-metapackages.git;a=commitdiff_plain;h=8638348a3e4797018c6ac97afdd001765f10e496

Allow vhost site names without .conf at the end
---

diff --git a/apache2-vhost-update b/apache2-vhost-update
index de224ea..cf5b1db 100755
--- a/apache2-vhost-update
+++ b/apache2-vhost-update
@@ -91,6 +91,10 @@ if echo "$site" | grep /; then
 	exit 1
 fi
 
+if [ -f "$STAGINGDIR/$site.conf" ] ; then
+	site="$site.conf"
+fi
+
 if ! [ -f "$STAGINGDIR/$site" ]; then
 	echo "$STAGINGDIR/$site does not exist or is not a file" >&2
 	exit 1