From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 26 Jan 2010 01:09:24 +0000 (-0200)
Subject: Minor fixes
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a62f05e8e9a565cd20a35f0911651fc4842e40e8;p=puppet-ikiwiki.git

Minor fixes
---

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