diff options
| author | mh <mh@immerda.ch> | 2010-10-22 23:04:09 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-10-22 23:04:09 +0200 |
| commit | 381b1a20288b959a96af78699bcc34a9bf220264 (patch) | |
| tree | cb3b8422ee8e31cb3a777d95bf722c47adee3d59 /manifests | |
| parent | a3027bd256133a739dc5ea6002349fdf61cd6e67 (diff) | |
whitespace
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/daemon.pp | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index c7df2af..5323e0b 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -1,63 +1,63 @@ class git::daemon { - include git - package{'git-daemon': - ensure => installed, - require => Package['git'], - } + include git + package{'git-daemon': + ensure => installed, + require => Package['git'], + } - include xinetd - file{'/etc/xinetd.d/git': - require => Package['git-daemon','xinetd'], - notify => Service[xinetd], - owner => root, group => 0, mode => 0755; + include xinetd + file{'/etc/xinetd.d/git': + require => Package['git-daemon','xinetd'], + notify => Service[xinetd], + owner => root, group => 0, mode => 0755; + } + file{'/etc/init.d/git-daemon': + require => Package['git-daemon'], + owner => root, group => 0, mode => 0755; + } + file{'/etc/sysconfig/git-daemon': + require => Package['git-daemon'], + owner => root, group => 0, mode => 0644; + } + service{'git-daemon': + hasstatus => true, + } + if $git_daemon == 'service' { + File['/etc/xinet.d/git']{ + source => "puppet:///modules/git/xinetd.d/git.disabled" } - file{'/etc/init.d/git-daemon': - require => Package['git-daemon'], - owner => root, group => 0, mode => 0755; + File['/etc/init.d/git-daemon']{ + source => [ "puppet:///modules/site-git/init.d/${fqdn}/git-daemon", + "puppet:///modules/site-git/init.d/git-daemon", + "puppet:///modules/git/init.d/git-daemon" ], } - file{'/etc/sysconfig/git-daemon': - require => Package['git-daemon'], - owner => root, group => 0, mode => 0644; + File['/etc/sysconfig/git-daemon']{ + source => [ "puppet:///modules/site-git/sysconfig/${fqdn}/git-daemon", + "puppet:///modules/site-git/sysconfig/git-daemon", + "puppet:///modules/git/sysconfig/git-daemon" ], } - service{'git-daemon': - hasstatus => true, + Service['git-daemon']{ + ensure => running, + enable => true, + require => [ File['/etc/sysconfig/git-daemon'], File['/etc/init.d/git-daemon'] ], } - if $git_daemon == 'service' { - File['/etc/xinet.d/git']{ - source => "puppet:///modules/git/xinetd.d/git.disabled" - } - File['/etc/init.d/git-daemon']{ - source => [ "puppet:///modules/site-git/init.d/${fqdn}/git-daemon", - "puppet:///modules/site-git/init.d/git-daemon", - "puppet:///modules/git/init.d/git-daemon" ], - } - File['/etc/sysconfig/git-daemon']{ - source => [ "puppet:///modules/site-git/sysconfig/${fqdn}/git-daemon", - "puppet:///modules/site-git/sysconfig/git-daemon", - "puppet:///modules/git/sysconfig/git-daemon" ], - } - Service['git-daemon']{ - ensure => running, - enable => true, - 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" ], - } - Service['git-daemon']{ - ensure => stopped, - enable => false, - before => [ File['/etc/sysconfig/git-daemon'], File['/etc/init.d/git-daemon'] ], - } - File['/etc/init.d/git-daemon','/etc/sysconfig/git-daemon']{ - ensure => absent, - } + } 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" ], } - - if $use_shorewall { - include shorewall::rules::gitdaemon + Service['git-daemon']{ + ensure => stopped, + enable => false, + before => [ File['/etc/sysconfig/git-daemon'], File['/etc/init.d/git-daemon'] ], } + File['/etc/init.d/git-daemon','/etc/sysconfig/git-daemon']{ + ensure => absent, + } + } + + if $use_shorewall { + include shorewall::rules::gitdaemon + } } |