Adding git-manager wrapper class

diff --git a/manifests/git-daemon.pp b/manifests/git-daemon.pp
index fdb0007f66b7bc845d16311c6e5bd567dd0150a5..5ed845a99d96ff43c91a3b20f93db2a2de4eafa1 100644 (file)
--- a/manifests/git-daemon.pp
+++ b/manifests/git-daemon.pp
@@ -4,7 +4,7 @@
 #
 #   http://reductivelabs.com/trac/puppet/wiki/Recipes/SimpleText
 
-class git-daemon inherits gitosis {
+class git-daemon inherits git-manager {
   # the needed packages and services
   include inetd
 

diff --git a/manifests/git-manager.pp b/manifests/git-manager.pp
new file mode 100644 (file)
index 0000000..9e29518
--- /dev/null
+++ b/manifests/git-manager.pp
@@ -0,0 +1,10 @@
+class git-manager {
+  case $use_gitolite {
+    true: {
+      include gitolite
+    },
+    default: {
+      include gitosis
+    }
+  }
+}

diff --git a/manifests/gitweb.pp b/manifests/gitweb.pp
index dbf08e1dd67c6c13a62f690e710798caf003e961..045787d6b45c016c53d335008911c1e8d74bcbff 100644 (file)
--- a/manifests/gitweb.pp
+++ b/manifests/gitweb.pp
@@ -1,6 +1,6 @@
 # This class handles a gitweb installation.
 
-class gitweb inherits gitosis {
+class gitweb inherits git-manager {
   # the needed packages
   package { gitweb: ensure => installed }
 

diff --git a/manifests/init.pp b/manifests/init.pp
index 9e1a5f646e34552bd648a1534085c1ff431ee28e..09e90105f481fcfbc441ad3a587244ec96d607f9 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,4 +4,5 @@ import "git.pp"
 import "gitosis.pp"
 import "gitweb.pp"
 import "git-daemon.pp"
+import "git-manager.pp"
 import "gitolite.pp"