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
Do not allow include statements in sites
[dsa-metapackages.git]
/
apache2-vhost-update
diff --git
a/apache2-vhost-update
b/apache2-vhost-update
index 61c5bf369567ec375acd91039e470a6aafaca1b3..a61369edeecf9c9b2622dabc94b3435efdd0c526 100755
(executable)
--- a/
apache2-vhost-update
+++ b/
apache2-vhost-update
@@
-112,8
+112,16
@@
if [ "$?" != "0" ]; then
echo "Could not get a lock/checkout $DESTINATION/$site." >&2
exit 1
fi
echo "Could not get a lock/checkout $DESTINATION/$site." >&2
exit 1
fi
+
cp -f "$STATINGDIR/$site" "$DESTINATION/$site"
cp -f "$STATINGDIR/$site" "$DESTINATION/$site"
+if grep -i include "$DESTINATION/$site" > /dev/null; then
+ echo "New site may have include statements - rejecting." >&2
+ rm -f "$DESTINATION/$site"
+ co "$DESTINATION/$site"
+ exit 1
+fi
+
/usr/sbin/apache2ctl configtest
if [ "$?" != "0" ]; then
echo "configtest returned errors; reverting." >&2
/usr/sbin/apache2ctl configtest
if [ "$?" != "0" ]; then
echo "configtest returned errors; reverting." >&2