diff options
author | Brice Figureau <brice-puppet@daysofwonder.com> | 2009-09-16 20:31:25 +0200 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2009-09-22 09:30:18 +1000 |
commit | a951163d3d8a52fff4f0340b4ed1e827f2399147 (patch) | |
tree | cedbcbf722303aa745532dd6cbf1f3bebd3fc705 /lib/puppet/provider/service/runit.rb | |
parent | 96b5087d4e8e6eb8e95f6dfab44163b486e1fd86 (diff) | |
download | puppet-a951163d3d8a52fff4f0340b4ed1e827f2399147.tar.gz puppet-a951163d3d8a52fff4f0340b4ed1e827f2399147.tar.xz puppet-a951163d3d8a52fff4f0340b4ed1e827f2399147.zip |
Fix #2642 - Runit provider rework
The runit provider was left broken after some work on daemontools
on which runit is based, and #2640 didn't override the
restart command, so daemontools once was called.
This patch aims to fix this provider and bring it on par with
daemontools.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/provider/service/runit.rb')
-rw-r--r-- | lib/puppet/provider/service/runit.rb | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/lib/puppet/provider/service/runit.rb b/lib/puppet/provider/service/runit.rb index 0182ec7d2..b313fc79c 100644 --- a/lib/puppet/provider/service/runit.rb +++ b/lib/puppet/provider/service/runit.rb @@ -66,10 +66,6 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do @servicedir end - def restartcmd - [ command(:sv), "restart", self.service] - end - def status begin output = sv "status", self.daemon @@ -82,23 +78,17 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do return :stopped end - # relay to the stopcmd def stop - ucommand( :stop ) - end - - def stopcmd - [ command(:sv), "stop", self.service] + sv "stop", self.service end - # relay to the startcmd def start enable unless enabled? == :true - ucommand( :start ) + sv "start", self.service end - def startcmd - [ command(:sv), "start", self.service] + def restart + sv "restart", self.service end # disable by removing the symlink so that runit |