diff options
Diffstat (limited to 'manifests/daemon')
| -rw-r--r-- | manifests/daemon/base.pp | 30 | ||||
| -rw-r--r-- | manifests/daemon/centos.pp | 19 | ||||
| -rw-r--r-- | manifests/daemon/debian.pp | 11 | ||||
| -rw-r--r-- | manifests/daemon/disable.pp | 21 | ||||
| -rw-r--r-- | manifests/daemon/vhosts.pp | 18 |
5 files changed, 78 insertions, 21 deletions
diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp new file mode 100644 index 0000000..5dd16d6 --- /dev/null +++ b/manifests/daemon/base.pp @@ -0,0 +1,30 @@ +class git::daemon::base { + + file { 'git-daemon_initscript': + source => [ "puppet://$server/modules/site-git/init.d/${fqdn}/git-daemon", + "puppet://$server/modules/site-git/init.d/${operatingsystem}/git-daemon", + "puppet://$server/modules/site-git/init.d/git-daemon", + "puppet://$server/modules/git/init.d/${operatingsystem}/git-daemon", + "puppet://$server/modules/git/init.d/git-daemon" ], + require => Package['git'], + owner => root, group => 0, mode => 0755; + } + + file { 'git-daemon_config': + source => [ "puppet://$server/modules/site-git/config/${fqdn}/git-daemon", + "puppet://$server/modules/site-git/config/${operatingsystem}/git-daemon", + "puppet://$server/modules/site-git/config/git-daemon", + "puppet://$server/modules/git/config/${operatingsystem}/git-daemon", + "puppet://$server/modules/git/config/git-daemon" ], + require => Package['git'], + owner => root, group => 0, mode => 0644; + } + + service { 'git-daemon': + ensure => running, + enable => true, + hasstatus => true, + require => [ File['git-daemon_initscript'], File['git-daemon_config'] ], + } + +} diff --git a/manifests/daemon/centos.pp b/manifests/daemon/centos.pp new file mode 100644 index 0000000..270685a --- /dev/null +++ b/manifests/daemon/centos.pp @@ -0,0 +1,19 @@ +class git::daemon::centos inherits git::daemon::base { + + package { 'git-daemon': + ensure => installed, + require => Package['git'], + alias => 'git-daemon', + } + + File['git-daemon_initscript'] { + path => '/etc/init.d/git-daemon', + require +> Package['git-daemon'], + } + + File['git-daemon_config'] { + path => '/etc/init.d/git-daemon', + require +> Package['git-daemon'], + } + +} diff --git a/manifests/daemon/debian.pp b/manifests/daemon/debian.pp new file mode 100644 index 0000000..006ffc5 --- /dev/null +++ b/manifests/daemon/debian.pp @@ -0,0 +1,11 @@ +class git::daemon::debian inherits git::daemon::base { + + File['git-daemon_initscript'] { + path => '/etc/init.d/git-daemon', + } + + File['git-daemon_config'] { + path => '/etc/default/git-daemon', + } + +} diff --git a/manifests/daemon/disable.pp b/manifests/daemon/disable.pp index 807d03e..b60fcec 100644 --- a/manifests/daemon/disable.pp +++ b/manifests/daemon/disable.pp @@ -1,26 +1,29 @@ class git::daemon::disable inherits git::daemon { - Package['git-daemon']{ - ensure => absent, - } - Xinetd::File['git']{ - source => "puppet:///modules/git/xinetd.d/git.disabled" + if defined(Package['git-daemon']) { + Package['git-daemon'] { + ensure => absent, + } } - File['/etc/init.d/git-daemon']{ + + File['git-daemon_initscript'] { ensure => absent, } - File['/etc/sysconfig/git-daemon']{ + + File['git-daemon_config'] { ensure => absent, } - Service['git-daemon']{ + + Service['git-daemon'] { ensure => stopped, enable => false, require => undef, - before => File['/etc/init.d/git-daemon'], + before => File['git-daemon_initscript'], } if $use_shorewall { include shorewall::rules::gitdaemon::absent } + } diff --git a/manifests/daemon/vhosts.pp b/manifests/daemon/vhosts.pp index beb33ab..d627df1 100644 --- a/manifests/daemon/vhosts.pp +++ b/manifests/daemon/vhosts.pp @@ -1,15 +1,9 @@ class git::daemon::vhosts inherits git::daemon { - if $git_daemon == 'service' { - File['/etc/sysconfig/git-daemon']{ - source => [ "puppet:///modules/site-git/sysconfig/${fqdn}/git-daemon.vhosts", - "puppet:///modules/site-git/sysconfig/git-daemon.vhosts", - "puppet:///modules/git/sysconfig/git-daemon.vhosts" ], + File['git-daemon_config']{ + source => [ "puppet://$server/modules/site-git/config/${fqdn}/git-daemon.vhosts", + "puppet://$server/modules/site-git/config/${operatingsystem}/git-daemon.vhosts", + "puppet://$server/modules/site-git/config/git-daemon.vhosts", + "puppet://$server/modules/git/config/${operatingsystem}/git-daemon.vhosts", + "puppet://$server/modules/git/config/git-daemon.vhosts" ], } - } else { - 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" ], - } - } } |