aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-25 23:09:24 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-25 23:09:24 -0200
commita62f05e8e9a565cd20a35f0911651fc4842e40e8 (patch)
treea5000de35339cf77c1a0e067bdf64a4b4b312d0a
parentb90150dfbcda79edc0748d3b8d1f7f9e491672e3 (diff)
downloadpuppet-ikiwiki-a62f05e8e9a565cd20a35f0911651fc4842e40e8.tar.gz
puppet-ikiwiki-a62f05e8e9a565cd20a35f0911651fc4842e40e8.tar.bz2
Minor fixes
-rw-r--r--templates/deploy.sh.erb4
-rw-r--r--templates/refresh.sh.erb4
2 files changed, 6 insertions, 2 deletions
diff --git a/templates/deploy.sh.erb b/templates/deploy.sh.erb
index 751264d..07760ec 100644
--- a/templates/deploy.sh.erb
+++ b/templates/deploy.sh.erb
@@ -13,10 +13,12 @@ REPO="/var/git/repositories/$NAME.git"
if [ -z "$INSTANCE" ]; then
echo "Usage:`basename $0` <site> <instance>"
+ exit 1
fi
-if [ ! -e "$CONF/$NAME" ]; then
+if [ ! -e "$CONF/$NAME.setup" ]; then
echo "No config file for $NAME"
+ exit 1
fi
# Setup source folder
diff --git a/templates/refresh.sh.erb b/templates/refresh.sh.erb
index fd20ff0..bca18e4 100644
--- a/templates/refresh.sh.erb
+++ b/templates/refresh.sh.erb
@@ -13,10 +13,12 @@ REPO="/var/git/repositories/$NAME.git"
if [ -z "$INSTANCE" ]; then
echo "Usage:`basename $0` <site> <instance>"
+ exit 1
fi
-if [ ! -e "$CONF/$NAME" ]; then
+if [ ! -e "$CONF/$NAME.setup" ]; then
echo "No config file for $NAME"
+ exit 1
fi
# Setup