From 688256dfdd7a094a2bdfea8c23570257178cca8c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 22 Dec 2012 17:17:53 -0200
Subject: Fixing git daemon config

---
 manifests/git-daemon.pp  | 2 +-
 manifests/git-manager.pp | 4 ++++
 manifests/gitweb.pp      | 4 ----
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'manifests')

diff --git a/manifests/git-daemon.pp b/manifests/git-daemon.pp
index 5ed845a..5a5e4fb 100644
--- a/manifests/git-daemon.pp
+++ b/manifests/git-daemon.pp
@@ -11,7 +11,7 @@ class git-daemon inherits git-manager {
   # git-daemon config in inetd
   line { "git-daemon-inetd":
     file   => "/etc/inetd.conf",
-    line   => "git stream tcp nowait gitosis /usr/bin/git git daemon --inetd --verbose --base-path=/var/git/repositories /var/git/repositories",
+    line   => "git stream tcp nowait $git_server_implementation /usr/bin/git git daemon --inetd --verbose --base-path=/var/git/repositories /var/git/repositories",
     ensure => present,
   }
 }
diff --git a/manifests/git-manager.pp b/manifests/git-manager.pp
index d3445d0..52e546b 100644
--- a/manifests/git-manager.pp
+++ b/manifests/git-manager.pp
@@ -1,4 +1,8 @@
 class git-manager {
+  case $git_server_implementation {
+    '': { $git_server_implementation = 'gitolite' }
+  }
+
   case $git_server_implementation {
     'gitosis': {
       include gitosis
diff --git a/manifests/gitweb.pp b/manifests/gitweb.pp
index 8d07e67..045787d 100644
--- a/manifests/gitweb.pp
+++ b/manifests/gitweb.pp
@@ -1,10 +1,6 @@
 # This class handles a gitweb installation.
 
 class gitweb inherits git-manager {
-  case $git_server_implementation {
-    '': { $git_server_implementation = 'gitolite' }
-  }
-
   # the needed packages
   package { gitweb: ensure => installed }
 
-- 
cgit v1.2.3