From b288eb327b0436124f2746e4301126c1bc67897e Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 22 Dec 2012 16:31:58 -0200
Subject: Make gitolite default

---
 manifests/git-manager.pp | 6 +++---
 manifests/gitolite.pp    | 3 +++
 manifests/gitweb.pp      | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'manifests')

diff --git a/manifests/git-manager.pp b/manifests/git-manager.pp
index e31db0b..d3445d0 100644
--- 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 4dddd2b..a2de08a 100644
--- 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 045787d..8d07e67 100644
--- 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 }
 
-- 
cgit v1.2.3