diff options
| -rw-r--r-- | manifests/git-manager.pp | 6 | ||||
| -rw-r--r-- | manifests/gitolite.pp | 3 | ||||
| -rw-r--r-- | manifests/gitweb.pp | 4 |
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 } |