diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-04-11 17:51:27 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-04-11 17:51:27 -0300 |
| commit | 4be9af9b63ef9abaa3bb835e8d271495f1c936bc (patch) | |
| tree | 4e0ecfd965c06829a3fa1897ea0da1777add66e0 /templates | |
| parent | f71a89900ed557d5309bc84f5c5a6c7af4718f67 (diff) | |
| download | puppet-ikiwiki-4be9af9b63ef9abaa3bb835e8d271495f1c936bc.tar.gz puppet-ikiwiki-4be9af9b63ef9abaa3bb835e8d271495f1c936bc.tar.bz2 | |
Major cleanup
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/deploy.sh.erb | 2 | ||||
| -rw-r--r-- | templates/refresh.sh.erb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/templates/deploy.sh.erb b/templates/deploy.sh.erb index 34064d7..61fd2d5 100644 --- a/templates/deploy.sh.erb +++ b/templates/deploy.sh.erb @@ -1,7 +1,7 @@ #!/bin/bash NAME="$1" -INSTANCE="$2" +INSTANCE="ikiwiki" BASE="<%= scope.lookupvar('ikiwiki::sites_folder') %>" SITE=$BASE/$NAME CONF="/etc/ikiwiki" diff --git a/templates/refresh.sh.erb b/templates/refresh.sh.erb index d7b7502..92c42ca 100644 --- a/templates/refresh.sh.erb +++ b/templates/refresh.sh.erb @@ -1,12 +1,12 @@ #!/bin/bash NAME="$1" -INSTANCE="$2" -WEB_OWNER="$3" -WEB_GROUP="$4" +WEB_OWNER="$2" +WEB_GROUP="$3" BASE="<%= scope.lookupvar('ikiwiki::sites_folder') %>" SITE="$BASE/$NAME" CONF="/etc/ikiwiki" +INSTANCE="ikiwiki" REPO_OWNER="<%= scope.lookupvar('ikiwiki::git_implementation') %>" REPO_GROUP="<%= scope.lookupvar('ikiwiki::git_implementation') %>" REPO="/var/git/repositories/$NAME.git" |