aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-12-22 16:31:58 -0200
committerSilvio Rhatto <rhatto@riseup.net>2012-12-22 16:31:58 -0200
commitb288eb327b0436124f2746e4301126c1bc67897e (patch)
tree8afb2d4fdfbec5c6606ef4340f7897bbd2460b3f
parentb49f04aee50d4bf0179c2fef3911e0d114d7764b (diff)
downloadpuppet-git-b288eb327b0436124f2746e4301126c1bc67897e.tar.gz
puppet-git-b288eb327b0436124f2746e4301126c1bc67897e.tar.bz2
Make gitolite default
-rw-r--r--manifests/git-manager.pp6
-rw-r--r--manifests/gitolite.pp3
-rw-r--r--manifests/gitweb.pp4
3 files changed, 10 insertions, 3 deletions
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 }