From 7b7a6a566974bc35687dfb1516eafd1421301c97 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 29 Mar 2013 13:37:52 -0300
Subject: Use gitolite as the default git implementation

---
 manifests/init.pp           | 3 ++-
 templates/deploy.sh.erb     | 4 ++--
 templates/ikiwiki.setup.erb | 4 ++--
 templates/refresh.sh.erb    | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 059b19a..789ff92 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,5 +1,6 @@
 class ikiwiki(
-  $sites_folder = '/var/sites'
+  $sites_folder       = '/var/sites'
+  $git_implementation = 'gitolite',
 ) {
   package { [ "ikiwiki", "po4a" ]:
     ensure => installed,
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
-- 
cgit v1.2.3