diff options
| author | mh <mh@immerda.ch> | 2010-10-22 23:27:33 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-10-22 23:27:33 +0200 |
| commit | 37f253cffe766a179dbb1ee3f86af740eff78ac1 (patch) | |
| tree | 90cd2df338930fec749e94f70f8e7e16817a8cb8 | |
| parent | 381b1a20288b959a96af78699bcc34a9bf220264 (diff) | |
use xinetd management define
| -rw-r--r-- | manifests/daemon.pp | 17 | ||||
| -rw-r--r-- | manifests/daemon/disable.pp | 3 | ||||
| -rw-r--r-- | manifests/daemon/vhosts.pp | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 5323e0b..01cfec2 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -5,11 +5,8 @@ class git::daemon { require => Package['git'], } - include xinetd - file{'/etc/xinetd.d/git': - require => Package['git-daemon','xinetd'], - notify => Service[xinetd], - owner => root, group => 0, mode => 0755; + xinetd::file{'git': + require => Package['git-daemon'], } file{'/etc/init.d/git-daemon': require => Package['git-daemon'], @@ -23,7 +20,7 @@ class git::daemon { hasstatus => true, } if $git_daemon == 'service' { - File['/etc/xinet.d/git']{ + Xinetd::File['git']{ source => "puppet:///modules/git/xinetd.d/git.disabled" } File['/etc/init.d/git-daemon']{ @@ -42,10 +39,10 @@ class git::daemon { require => [ File['/etc/sysconfig/git-daemon'], File['/etc/init.d/git-daemon'] ], } } else { - File['/etc/xinetd.d/git']{ - source => [ "puppet:///modules/site-git/xinetd.d/${fqdn}/git", - "puppet:///modules/site-git/xinetd.d/git", - "puppet:///modules/git/xinetd.d/git" ], + Xinetd::File['git']{ + source => [ "puppet:///modules/site-git/xinetd.d/${fqdn}/git", + "puppet:///modules/site-git/xinetd.d/git", + "puppet:///modules/git/xinetd.d/git" ], } Service['git-daemon']{ ensure => stopped, diff --git a/manifests/daemon/disable.pp b/manifests/daemon/disable.pp index 6e01268..807d03e 100644 --- a/manifests/daemon/disable.pp +++ b/manifests/daemon/disable.pp @@ -3,6 +3,9 @@ class git::daemon::disable inherits git::daemon { ensure => absent, } + Xinetd::File['git']{ + source => "puppet:///modules/git/xinetd.d/git.disabled" + } File['/etc/init.d/git-daemon']{ ensure => absent, } diff --git a/manifests/daemon/vhosts.pp b/manifests/daemon/vhosts.pp index 8dd238d..beb33ab 100644 --- a/manifests/daemon/vhosts.pp +++ b/manifests/daemon/vhosts.pp @@ -6,7 +6,7 @@ class git::daemon::vhosts inherits git::daemon { "puppet:///modules/git/sysconfig/git-daemon.vhosts" ], } } else { - File['/etc/xinetd.d/git']{ + Xinetd::File['git']{ source => [ "puppet:///modules/site-git/xinetd.d/${fqdn}/git.vhosts", "puppet:///modules/site-git/xinetd.d/git.vhosts", "puppet:///modules/git/xinetd.d/git.vhosts" ], |