diff options
Diffstat (limited to 'manifests/daemon')
| -rw-r--r-- | manifests/daemon/base.pp | 56 | ||||
| -rw-r--r-- | manifests/daemon/centos.pp | 28 | ||||
| -rw-r--r-- | manifests/daemon/disable.pp | 2 | ||||
| -rw-r--r-- | manifests/daemon/vhosts.pp | 15 |
4 files changed, 51 insertions, 50 deletions
diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp index 5632950..0b48b21 100644 --- a/manifests/daemon/base.pp +++ b/manifests/daemon/base.pp @@ -1,31 +1,31 @@ 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'], - path => "/etc/init.d/git-daemon", - 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'], - path => "/etc/default/git-daemon", - owner => root, group => 0, mode => 0644; - } - - service { 'git-daemon': - ensure => running, - enable => true, - hasstatus => true, - require => [ File['git-daemon_initscript'], File['git-daemon_config'] ], - } + 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'], + path => "/etc/init.d/git-daemon", + 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'], + path => "/etc/default/git-daemon", + 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 index 270685a..e276259 100644 --- a/manifests/daemon/centos.pp +++ b/manifests/daemon/centos.pp @@ -1,19 +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'], - } + 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'], - } + File['git-daemon_config'] { + path => '/etc/init.d/git-daemon', + require +> Package['git-daemon'], + } } diff --git a/manifests/daemon/disable.pp b/manifests/daemon/disable.pp index 958e6fe..057cc88 100644 --- a/manifests/daemon/disable.pp +++ b/manifests/daemon/disable.pp @@ -2,7 +2,7 @@ class git::daemon::disable inherits git::daemon::base { if defined(Package['git-daemon']) { Package['git-daemon'] { - ensure => absent, + ensure => absent, } } diff --git a/manifests/daemon/vhosts.pp b/manifests/daemon/vhosts.pp index d627df1..b568b65 100644 --- a/manifests/daemon/vhosts.pp +++ b/manifests/daemon/vhosts.pp @@ -1,9 +1,10 @@ class git::daemon::vhosts inherits git::daemon { - 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" ], - } + + 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" ], + } } |