aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-03-29 14:35:59 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-03-29 14:35:59 -0300
commit6a1d968b0b695343e0e5e868720d6c329c55a611 (patch)
treeff138f7e8be09e3f14520861e7e48b632a5cd41a
parentb5fb8790e6e892d03e6eb2d1af52b2bfee635326 (diff)
downloadpuppet-ikiwiki-6a1d968b0b695343e0e5e868720d6c329c55a611.tar.gz
puppet-ikiwiki-6a1d968b0b695343e0e5e868720d6c329c55a611.tar.bz2
OOps (3)
-rw-r--r--templates/deploy.sh.erb4
-rw-r--r--templates/ikiwiki.setup.erb4
-rw-r--r--templates/refresh.sh.erb4
3 files changed, 6 insertions, 6 deletions
diff --git a/templates/deploy.sh.erb b/templates/deploy.sh.erb
index 86150aa..91aee0e 100644
--- a/templates/deploy.sh.erb
+++ b/templates/deploy.sh.erb
@@ -7,8 +7,8 @@ SITE=$BASE/$NAME
CONF="/etc/ikiwiki"
WEB_OWNER="www-data"
WEB_GROUP="www-data"
-REPO_OWNER="<%= scope.lookupvar('ikiwiki:git_implementation') %>"
-REPO_GROUP="<%= scope.lookupvar('ikiwiki:git_implementation') %>"
+REPO_OWNER="<%= scope.lookupvar('ikiwiki::git_implementation') %>"
+REPO_GROUP="<%= scope.lookupvar('ikiwiki::git_implementation') %>"
REPO="/var/git/repositories/$NAME.git"
if [ -z "$INSTANCE" ]; then
diff --git a/templates/ikiwiki.setup.erb b/templates/ikiwiki.setup.erb
index f9f08bb..6675556 100644
--- a/templates/ikiwiki.setup.erb
+++ b/templates/ikiwiki.setup.erb
@@ -65,7 +65,7 @@ use IkiWiki::Setup::Standard {
cgi => 1,
wrapper => "<%= scope.lookupvar('ikiwiki::sites_folder') %>/<%= name %>/ikiwiki/ikiwiki.cgi",
wrappermode => "06550",
- wrappergroup => "<%= scope.lookupvar('ikiwiki:git_implementation') %>",
+ wrappergroup => "<%= scope.lookupvar('ikiwiki::git_implementation') %>",
},
#{
# # The svn post-commit wrapper.
@@ -85,7 +85,7 @@ use IkiWiki::Setup::Standard {
# what you want.
wrapper => "/var/git/repositories/<%= name %>.git/hooks/post-update",
wrappermode => "06550",
- wrappergroup => "<%= scope.lookupvar('ikiwiki:git_implementation') %>",
+ wrappergroup => "<%= scope.lookupvar('ikiwiki::git_implementation') %>",
},
#{
# # The monotone netsync hook.
diff --git a/templates/refresh.sh.erb b/templates/refresh.sh.erb
index 1071fa8..4308934 100644
--- a/templates/refresh.sh.erb
+++ b/templates/refresh.sh.erb
@@ -7,8 +7,8 @@ SITE=$BASE/$NAME
CONF="/etc/ikiwiki"
WEB_OWNER="www-data"
WEB_GROUP="www-data"
-REPO_OWNER="<%= scope.lookupvar('ikiwiki:git_implementation') %>"
-REPO_GROUP="<%= scope.lookupvar('ikiwiki:git_implementation') %>"
+REPO_OWNER="<%= scope.lookupvar('ikiwiki::git_implementation') %>"
+REPO_GROUP="<%= scope.lookupvar('ikiwiki::git_implementation') %>"
REPO="/var/git/repositories/$NAME.git"
if [ -z "$INSTANCE" ]; then