diff options
| author | mh <mh@immerda.ch> | 2013-05-20 16:04:07 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2013-05-20 16:09:31 +0200 |
| commit | 4fabfbd53cfb7c35cf7ad9ff03b6b38d4daed7b4 (patch) | |
| tree | 35cea961d9f7f8dbd532eb10c33040a615bbbde4 | |
| parent | 9eb6c4f0e5fec4d24b0480b186ce83f490d68b80 (diff) | |
if it runs with passenger there is no such service
| -rw-r--r-- | manifests/master/centos.pp | 19 | ||||
| -rw-r--r-- | manifests/master/linux.pp | 6 | ||||
| -rw-r--r-- | manifests/master/package/base.pp | 6 |
3 files changed, 19 insertions, 12 deletions
diff --git a/manifests/master/centos.pp b/manifests/master/centos.pp index 82a8436..b684174 100644 --- a/manifests/master/centos.pp +++ b/manifests/master/centos.pp @@ -1,12 +1,17 @@ # manifests/puppetmaster/centos.pp class puppet::master::centos inherits puppet::master::package { - file { '/etc/sysconfig/puppetmaster': - source => [ "puppet:///modules/site_puppet/sysconfig/${::fqdn}/puppetmaster", - "puppet:///modules/site_puppet/sysconfig/${::domain}/puppetmaster", - "puppet:///modules/site_puppet/sysconfig/puppetmaster", - "puppet:///modules/puppet/sysconfig/puppetmaster" ], - notify => Service[puppetmaster], - owner => root, group => 0, mode => 0644; + source => [ "puppet:///modules/site_puppet/sysconfig/${::fqdn}/puppetmaster", + "puppet:///modules/site_puppet/sysconfig/${::domain}/puppetmaster", + 'puppet:///modules/site_puppet/sysconfig/puppetmaster', + 'puppet:///modules/puppet/sysconfig/puppetmaster' ], + owner => root, + group => 0, + mode => '0644'; + } + if $puppet::master::mode != 'passenger' { + File['/etc/sysconfig/puppetmaster']{ + notify => Service[puppetmaster], + } } } diff --git a/manifests/master/linux.pp b/manifests/master/linux.pp index d2fb5b1..e52db63 100644 --- a/manifests/master/linux.pp +++ b/manifests/master/linux.pp @@ -11,8 +11,8 @@ class puppet::master::linux inherits puppet::linux { enable => true, require => [ Package[puppet] ], } - } - Service[puppet]{ - require +> Service[puppetmaster], + Service[puppet]{ + require +> Service[puppetmaster], + } } } diff --git a/manifests/master/package/base.pp b/manifests/master/package/base.pp index 0a1fa33..2851747 100644 --- a/manifests/master/package/base.pp +++ b/manifests/master/package/base.pp @@ -4,7 +4,9 @@ class puppet::master::package::base inherits puppet::master::package { ensure => $puppet::ensure_version, } - Service['puppetmaster']{ - require +> Package['puppetmaster'], + if $puppet::master::mode != 'passenger' { + Service['puppetmaster']{ + require +> Package['puppetmaster'], + } } } |