aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-09 19:14:37 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-09 19:14:37 -0300
commit442de21e518b6f992d181889d22a501b3d6a3034 (patch)
tree6a3088c4742a86d3a20bb7d6be48239536edb050
parentdee99cd4f9f05158c6d7b5626d47b874b9819ff2 (diff)
downloadpuppet-git-442de21e518b6f992d181889d22a501b3d6a3034.tar.gz
puppet-git-442de21e518b6f992d181889d22a501b3d6a3034.tar.bz2
Make inetd optional
-rw-r--r--manifests/daemon.pp19
1 files changed, 11 insertions, 8 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 47746a6..057f778 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,5 +1,6 @@
class git::daemon (
$implementation = hiera('git::daemon::implementation', 'gitolite')
+ $inetd = hiera('git::daemon::inetd', true)
) {
# directory for git user and repositories
file { "/var/git":
@@ -70,15 +71,17 @@ class git::daemon (
# default implementation
include git::gitolite
- # the needed packages and services
- include inetd
+ # include inetd if needed
+ if ($inetd == true) {
+ include inetd
- # git-daemon config in inetd
- line { "git-daemon-inetd":
- file => "/etc/inetd.conf",
- line => "git stream tcp nowait git /usr/bin/git git daemon --inetd --verbose --base-path=/var/git/repositories /var/git/repositories",
- ensure => present,
- notify => Service['inetd'],
+ # git-daemon config in inetd
+ line { "git-daemon-inetd":
+ file => "/etc/inetd.conf",
+ line => "git stream tcp nowait git /usr/bin/git git daemon --inetd --verbose --base-path=/var/git/repositories /var/git/repositories",
+ ensure => present,
+ notify => Service['inetd'],
+ }
}
# See http://bastian.rieck.ru/blog/posts/2013/gitweb_readme_workflow/