Minor fix

diff --git a/templates/deploy.sh.erb b/templates/deploy.sh.erb
index 2673d3a23a1a79a86f27877798d604226923e3bf..8d5dfd842b737666ec8a4bf2328bd08e9c408efe 100644 (file)
--- a/templates/deploy.sh.erb
+++ b/templates/deploy.sh.erb
@@ -7,13 +7,13 @@
 NAME="$1"
 OWNER="$2"
 GROUP="$3"
-SITE=$BASE/$NAME
 INSTANCE="ikiwiki"
 CONF="/etc/ikiwiki"
 BASE="<%= scope.lookupvar('ikiwiki::sites_folder') %>"
 REPO_OWNER="<%= scope.lookupvar('ikiwiki::git_implementation') %>"
 REPO="<%= scope.lookupvar('ikiwiki::git_folder') %>/$NAME.git"
 REMOTE="$REPO_OWNER@localhost:$NAME"
+SITE=$BASE/$NAME
 
 # Syntax check
 if [ -z "$INSTANCE" ]; then

diff --git a/templates/refresh.sh.erb b/templates/refresh.sh.erb
index 7e7adf6c259c5c8e8feafdc5a6c73c4f3889dac9..6353822f058ddb3a6b0bfc550b1ca72050e7bba6 100644 (file)
--- a/templates/refresh.sh.erb
+++ b/templates/refresh.sh.erb
@@ -7,7 +7,6 @@
 NAME="$1"
 OWNER="$2"
 GROUP="$3"
-SITE="$BASE/$NAME"
 CONF="/etc/ikiwiki"
 INSTANCE="ikiwiki"
 WWW_USER="<%= scope.lookupvar('ikiwiki::www_user') %>"
@@ -15,6 +14,7 @@ BASE="<%= scope.lookupvar('ikiwiki::sites_folder') %>"
 REPO_OWNER="<%= scope.lookupvar('ikiwiki::git_implementation') %>"
 REPO_GROUP="<%= scope.lookupvar('ikiwiki::git_implementation') %>"
 REPO="<%= scope.lookupvar('ikiwiki::git_folder') %>/$NAME.git"
+SITE="$BASE/$NAME"
 
 # Syntax check
 if [ -z "$INSTANCE" ]; then