Use gitolite as the default git implementation

diff --git a/manifests/init.pp b/manifests/init.pp
index 059b19ace716bf7ea04bc8b5eda0c6b1ac0605c0..789ff92ae7fe83740487029b8e85e0863204d750 100644 (file)
--- 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 4bbfb43bd68f2d102430f77786cc68392f408387..86150aa3f5810cd99505df3fd7bb0c1a3bcad492 100644 (file)
--- 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 1c9098802c3fda8aeb5ee0daedaeb8ff3b6c540a..f9f08bbf3b5a6d28872b9b98dbc4e471e414140c 100644 (file)
--- 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 0b2b796c4c68e5685cbe76e4eccabb4404d02b4d..1071fa8d891dc6b04720dc81bb30c9c0dad5b44f 100644 (file)
--- 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