aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-03-29 13:37:52 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-03-29 13:37:52 -0300
commit7b7a6a566974bc35687dfb1516eafd1421301c97 (patch)
tree3b56e5ea26b97af3bd289038712afda126b49b1e /templates
parenta39336ce95733ec434758d18ea05e0466c881fec (diff)
downloadpuppet-ikiwiki-7b7a6a566974bc35687dfb1516eafd1421301c97.tar.gz
puppet-ikiwiki-7b7a6a566974bc35687dfb1516eafd1421301c97.tar.bz2
Use gitolite as the default git implementation
Diffstat (limited to 'templates')
-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 4bbfb43..86150aa 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="gitosis"
-REPO_GROUP="gitosis"
+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 1c90988..f9f08bb 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 => "gitosis",
+ 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 => "gitosis",
+ wrappergroup => "<%= scope.lookupvar('ikiwiki:git_implementation') %>",
},
#{
# # The monotone netsync hook.
diff --git a/templates/refresh.sh.erb b/templates/refresh.sh.erb
index 0b2b796..1071fa8 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="gitosis"
-REPO_GROUP="gitosis"
+REPO_OWNER="<%= scope.lookupvar('ikiwiki:git_implementation') %>"
+REPO_GROUP="<%= scope.lookupvar('ikiwiki:git_implementation') %>"
REPO="/var/git/repositories/$NAME.git"
if [ -z "$INSTANCE" ]; then