diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-04-11 20:52:21 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-04-11 20:52:21 -0300 |
| commit | 4b4bbc4b49ec0ac6dceb5d276bfb08d1a96ae306 (patch) | |
| tree | 520b89d618ac73a9e9943bafdb79f672b7b8eff0 | |
| parent | 2d304317118ecb8296bcc3ed489dea7af7828b03 (diff) | |
| download | puppet-ikiwiki-4b4bbc4b49ec0ac6dceb5d276bfb08d1a96ae306.tar.gz puppet-ikiwiki-4b4bbc4b49ec0ac6dceb5d276bfb08d1a96ae306.tar.bz2 | |
Minor fix
| -rw-r--r-- | templates/deploy.sh.erb | 2 | ||||
| -rw-r--r-- | templates/refresh.sh.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/deploy.sh.erb b/templates/deploy.sh.erb index 2673d3a..8d5dfd8 100644 --- 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 7e7adf6..6353822 100644 --- 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 |