diff options
| author | Keith aka fugit <fugit13@gmail.com> | 2011-04-22 10:50:27 -0400 |
|---|---|---|
| committer | Keith aka fugit <fugit13@gmail.com> | 2011-04-22 10:50:27 -0400 |
| commit | 48affeddf6b343452e44cacd7b0d97295ba79a7b (patch) | |
| tree | 45d67f4b17b1bda078daff5f30de5849510ae448 | |
| parent | 66ce6a1344ab711b29897a26ab60da14f295fa6e (diff) | |
Fix the notify call for puppet service so it will work with passenger
| -rw-r--r-- | manifests/puppetmaster/debian.pp | 9 | ||||
| -rw-r--r-- | manifests/puppetmaster/linux.pp | 6 | ||||
| -rw-r--r-- | manifests/puppetmaster/package/base.pp | 6 |
3 files changed, 15 insertions, 6 deletions
diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp index 8cee0ea..a7d7f0a 100644 --- a/manifests/puppetmaster/debian.pp +++ b/manifests/puppetmaster/debian.pp @@ -8,12 +8,19 @@ class puppet::puppetmaster::debian inherits puppet::puppetmaster::package { } } + if $puppetmaster_mode == 'passenger' { + $puppetmaster_default_nofity = 'Exec[notify_passenger_puppetmaster]' + } + file { '/etc/default/puppetmaster': source => [ "puppet:///modules/site-puppet/master/debian/${fqdn}/puppetmaster", "puppet:///modules/site-puppet/master/debian/${domain}/puppetmaster", "puppet:///modules/site-puppet/master/debian/puppetmaster", "puppet:///modules/puppet/master/debian/puppetmaster" ], - notify => Service[puppetmaster], + notify => $puppetmaster_default_nofity ? { + '' => Service[puppetmaster], + default => Exec['notify_passenger_puppetmaster'] + }, owner => root, group => 0, mode => 0644; } } diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp index 2670203..a5098cd 100644 --- a/manifests/puppetmaster/linux.pp +++ b/manifests/puppetmaster/linux.pp @@ -11,8 +11,8 @@ class puppet::puppetmaster::linux inherits puppet::linux { enable => true, require => [ Package[puppet] ], } - } - Service[puppet]{ - require +> Service[puppetmaster], + Service[puppet]{ + require +> Service[puppetmaster], + } } } diff --git a/manifests/puppetmaster/package/base.pp b/manifests/puppetmaster/package/base.pp index 363f827..ff8d02a 100644 --- a/manifests/puppetmaster/package/base.pp +++ b/manifests/puppetmaster/package/base.pp @@ -4,7 +4,9 @@ class puppet::puppetmaster::package::base inherits puppet::puppetmaster::package ensure => present, } - Service['puppetmaster']{ - require +> Package['puppetmaster'], + if $puppetmaster_mode != 'passenger' { + Service['puppetmaster']{ + require +> Package['puppetmaster'], + } } } |