diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-12-22 17:17:53 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-12-22 17:17:53 -0200 |
| commit | 688256dfdd7a094a2bdfea8c23570257178cca8c (patch) | |
| tree | 0f5c46abbc3b4150abf989cab33f5dcbaf3bb6dd | |
| parent | 0f47e9b2754a34ca01d770b81008c85fea291a64 (diff) | |
| download | puppet-git-688256dfdd7a094a2bdfea8c23570257178cca8c.tar.gz puppet-git-688256dfdd7a094a2bdfea8c23570257178cca8c.tar.bz2 | |
Fixing git daemon config
| -rw-r--r-- | manifests/git-daemon.pp | 2 | ||||
| -rw-r--r-- | manifests/git-manager.pp | 4 | ||||
| -rw-r--r-- | manifests/gitweb.pp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/manifests/git-daemon.pp b/manifests/git-daemon.pp index 5ed845a..5a5e4fb 100644 --- a/manifests/git-daemon.pp +++ b/manifests/git-daemon.pp @@ -11,7 +11,7 @@ class git-daemon inherits git-manager { # git-daemon config in inetd line { "git-daemon-inetd": file => "/etc/inetd.conf", - line => "git stream tcp nowait gitosis /usr/bin/git git daemon --inetd --verbose --base-path=/var/git/repositories /var/git/repositories", + line => "git stream tcp nowait $git_server_implementation /usr/bin/git git daemon --inetd --verbose --base-path=/var/git/repositories /var/git/repositories", ensure => present, } } diff --git a/manifests/git-manager.pp b/manifests/git-manager.pp index d3445d0..52e546b 100644 --- a/manifests/git-manager.pp +++ b/manifests/git-manager.pp @@ -1,5 +1,9 @@ class git-manager { case $git_server_implementation { + '': { $git_server_implementation = 'gitolite' } + } + + case $git_server_implementation { 'gitosis': { include gitosis } diff --git a/manifests/gitweb.pp b/manifests/gitweb.pp index 8d07e67..045787d 100644 --- a/manifests/gitweb.pp +++ b/manifests/gitweb.pp @@ -1,10 +1,6 @@ # 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 } |