Fixing git daemon config

diff --git a/manifests/git-daemon.pp b/manifests/git-daemon.pp
index 5ed845a99d96ff43c91a3b20f93db2a2de4eafa1..5a5e4fb34775c9e0873e036786d24e504506754a 100644 (file)
--- 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 d3445d0d32ba5ca911e559f9820139be4c50e59f..52e546b8584d47ec7f7a4be5a2d9b5d5974972d4 100644 (file)
--- 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 8d07e67b5c098b346453202755bd84925a27065f..045787d6b45c016c53d335008911c1e8d74bcbff 100644 (file)
--- 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 }