Make gitolite default

diff --git a/manifests/git-manager.pp b/manifests/git-manager.pp
index e31db0b4098cf30c76916c54f8fb166c1913c229..d3445d0d32ba5ca911e559f9820139be4c50e59f 100644 (file)
--- a/manifests/git-manager.pp
+++ b/manifests/git-manager.pp
@@ -1,10 +1,10 @@
 class git-manager {
   case $git_server_implementation {
-    'gitolite': {
-      include gitolite
+    'gitosis': {
+      include gitosis
     }
     default: {
-      include gitosis
+      include gitolite
     }
   }
 }

diff --git a/manifests/gitolite.pp b/manifests/gitolite.pp
index 4dddd2b159d93c508e4192b1a3b398c643aa8b2c..a2de08a27e09d31284a154a60123800b321f2ceb 100644 (file)
--- a/manifests/gitolite.pp
+++ b/manifests/gitolite.pp
@@ -30,6 +30,9 @@ class gitolite inherits git {
   # the needed packages
   package { "gitolite": ensure => installed }
 
+  # make sure this is not installed
+  package { "gitosis": ensure => purged }
+
   # ensures that the group exists
   group { "gitolite":
     ensure    => present,

diff --git a/manifests/gitweb.pp b/manifests/gitweb.pp
index 045787d6b45c016c53d335008911c1e8d74bcbff..8d07e67b5c098b346453202755bd84925a27065f 100644 (file)
--- a/manifests/gitweb.pp
+++ b/manifests/gitweb.pp
@@ -1,6 +1,10 @@
 # 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 }