diff options
author | Luke Kanies <luke@madstop.com> | 2008-03-20 11:55:42 -0500 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2008-03-20 11:55:42 -0500 |
commit | e1907798425a7b163ac1b831b0cf11e88985815e (patch) | |
tree | 281191621b07b939ad724981d110b9a85463b5e1 /lib/puppet/metatype/metaparams.rb | |
parent | 9f8bb7e42aeea4670d9292f935529f8db5d57bc5 (diff) | |
parent | e00065a8e63a7222eacbc7e8aaa925e967fd5c60 (diff) | |
download | puppet-e1907798425a7b163ac1b831b0cf11e88985815e.tar.gz puppet-e1907798425a7b163ac1b831b0cf11e88985815e.tar.xz puppet-e1907798425a7b163ac1b831b0cf11e88985815e.zip |
Merge branch '0.24.x'
Diffstat (limited to 'lib/puppet/metatype/metaparams.rb')
-rw-r--r-- | lib/puppet/metatype/metaparams.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/metatype/metaparams.rb b/lib/puppet/metatype/metaparams.rb index 9983c34d2..edd594114 100644 --- a/lib/puppet/metatype/metaparams.rb +++ b/lib/puppet/metatype/metaparams.rb @@ -375,7 +375,7 @@ class Puppet::Type } service { nagios: running => true, - subscribe => file[nagconf] + subscribe => File[nagconf] } } @@ -392,7 +392,7 @@ class Puppet::Type file { "/var/nagios/configuration": source => "...", recurse => true, - before => exec["nagios-rebuid"] + before => Exec["nagios-rebuid"] } exec { "nagios-rebuild": @@ -410,7 +410,7 @@ class Puppet::Type file { "/etc/sshd_config": source => "....", - notify => service[sshd] + notify => Service[sshd] } service { sshd: |