chiark
/
gitweb
/
~ianmdlvl
/
dsa-metapackages.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Allow updating foo when foo and foo.conf both exist
[dsa-metapackages.git]
/
apache2-vhost-update
diff --git
a/apache2-vhost-update
b/apache2-vhost-update
index cf5b1dbcb0992995b1817d24a94cb0786fce23e0..2c283a39f7ae7c021c27c62ee7369a9dd45fe88b 100755
(executable)
--- 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