puppet 0.25.5 → 2.6.0

data/lib/puppet/provider/service/bsd.rb

@@ -0,0 +1,48 @@
+# Manage FreeBSD services.
+Puppet::Type.type(:service).provide :bsd, :parent => :init do
+  desc "FreeBSD's (and probably NetBSD?) form of ``init``-style service management.
+
+  Uses ``rc.conf.d`` for service enabling and disabling.
+
+"
+
+  confine :operatingsystem => [:freebsd, :netbsd, :openbsd]
+
+  @@rcconf_dir = '/etc/rc.conf.d'
+
+  def self.defpath
+    superclass.defpath
+  end
+
+  # remove service file from rc.conf.d to disable it
+  def disable
+    rcfile = File.join(@@rcconf_dir, @model[:name])
+    File.delete(rcfile) if File.exists?(rcfile)
+  end
+
+  # if the service file exists in rc.conf.d then it's already enabled
+  def enabled?
+    rcfile = File.join(@@rcconf_dir, @model[:name])
+    return :true if File.exists?(rcfile)
+
+    :false
+  end
+
+  # enable service by creating a service file under rc.conf.d with the
+  # proper contents
+  def enable
+    Dir.mkdir(@@rcconf_dir) if not File.exists?(@@rcconf_dir)
+    rcfile = File.join(@@rcconf_dir, @model[:name])
+    open(rcfile, 'w') { |f| f << "%s_enable=\"YES\"\n" % @model[:name] }
+  end
+
+  # Override stop/start commands to use one<cmd>'s and the avoid race condition
+  # where provider trys to stop/start the service before it is enabled
+  def startcmd
+    [self.initscript, :onestart]
+  end
+
+  def stopcmd
+    [self.initscript, :onestop]
+  end
+end

data/lib/puppet/provider/service/daemontools.rb

@@ -2,197 +2,193 @@
 #
 # author Brice Figureau <brice-puppet@daysofwonder.com>
 Puppet::Type.type(:service).provide :daemontools, :parent => :base do
-    desc "Daemontools service management.
+  desc "Daemontools service management.
 
-    This provider manages daemons running supervised by D.J.Bernstein daemontools.
-    It tries to detect the service directory, with by order of preference:
+  This provider manages daemons running supervised by D.J.Bernstein daemontools.
+  It tries to detect the service directory, with by order of preference:
 
-    * /service
-    * /etc/service
-    * /var/lib/svscan
+  * /service
+  * /etc/service
+  * /var/lib/svscan
 
-    The daemon directory should be placed in a directory that can be
-    by default in:
+  The daemon directory should be placed in a directory that can be
+  by default in:
 
-    * /var/lib/service
-    * /etc
+  * /var/lib/service
+  * /etc
 
-    or this can be overriden in the service resource parameters::
+  or this can be overriden in the service resource parameters::
 
-      service {
-       \"myservice\":
-         provider => \"daemontools\", path => \"/path/to/daemons\";
-      }
+    service {
+      \"myservice\":
+      provider => \"daemontools\", path => \"/path/to/daemons\";
+    }
 
-    This provider supports out of the box:
+  This provider supports out of the box:
 
-    * start/stop (mapped to enable/disable)
-    * enable/disable
-    * restart
-    * status
+  * start/stop (mapped to enable/disable)
+  * enable/disable
+  * restart
+  * status
 
-    If a service has ensure => \"running\", it will link /path/to/daemon to
-    /path/to/service, which will automatically enable the service.
+  If a service has ensure => \"running\", it will link /path/to/daemon to
+  /path/to/service, which will automatically enable the service.
 
-    If a service has ensure => \"stopped\", it will only down the service, not
-    remove the /path/to/service link.
+  If a service has ensure => \"stopped\", it will only down the service, not
+  remove the /path/to/service link.
 
-    "
+  "
 
-    commands :svc  => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
+  commands :svc  => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
 
-    class << self
-        attr_writer :defpath
+  class << self
+    attr_writer :defpath
 
-        # Determine the daemon path.
-        def defpath(dummy_argument=:work_arround_for_ruby_GC_bug)
-            unless defined?(@defpath) and @defpath
-                ["/var/lib/service", "/etc"].each do |path|
-                    if FileTest.exist?(path)
-                        @defpath = path
-                        break
-                    end
-                end
-                raise "Could not find the daemon directory (tested [/var/lib/service,/etc])" unless @defpath
-            end
-            @defpath
+    # Determine the daemon path.
+    def defpath(dummy_argument=:work_arround_for_ruby_GC_bug)
+      unless @defpath
+        ["/var/lib/service", "/etc"].each do |path|
+          if FileTest.exist?(path)
+            @defpath = path
+            break
+          end
         end
+        raise "Could not find the daemon directory (tested [/var/lib/service,/etc])" unless @defpath
+      end
+      @defpath
     end
+  end
 
-    attr_writer :servicedir
+  attr_writer :servicedir
 
-    # returns all providers for all existing services in @defpath
-    # ie enabled or not
-    def self.instances
-        path = self.defpath
-        unless FileTest.directory?(path)
-            Puppet.notice "Service path %s does not exist" % path
-            next
-        end
-
-        # reject entries that aren't either a directory
-        # or don't contain a run file
-        Dir.entries(path).reject { |e|
-            fullpath = File.join(path, e)
-            e =~ /^\./ or ! FileTest.directory?(fullpath) or ! FileTest.exist?(File.join(fullpath,"run"))
-        }.collect do |name|
-            new(:name => name, :path => path)
-        end
+  # returns all providers for all existing services in @defpath
+  # ie enabled or not
+  def self.instances
+    path = self.defpath
+    unless FileTest.directory?(path)
+      Puppet.notice "Service path #{path} does not exist"
+      next
     end
 
-    # returns the daemon dir on this node
-    def self.daemondir
-        self.defpath
+    # reject entries that aren't either a directory
+    # or don't contain a run file
+    Dir.entries(path).reject { |e|
+      fullpath = File.join(path, e)
+      e =~ /^\./ or ! FileTest.directory?(fullpath) or ! FileTest.exist?(File.join(fullpath,"run"))
+    }.collect do |name|
+      new(:name => name, :path => path)
     end
-
-    # find the service dir on this node
-    def servicedir
-        unless defined?(@servicedir) and @servicedir
-            ["/service", "/etc/service","/var/lib/svscan"].each do |path|
-                if FileTest.exist?(path)
-                    @servicedir = path
-                    break
-                end
-            end
-            raise "Could not find service directory" unless @servicedir
+  end
+
+  # returns the daemon dir on this node
+  def self.daemondir
+    self.defpath
+  end
+
+  # find the service dir on this node
+  def servicedir
+    unless @servicedir
+      ["/service", "/etc/service","/var/lib/svscan"].each do |path|
+        if FileTest.exist?(path)
+          @servicedir = path
+          break
         end
-        @servicedir
+      end
+      raise "Could not find service directory" unless @servicedir
     end
-
-    # returns the full path of this service when enabled
-    # (ie in the service directory)
-    def service
-        File.join(self.servicedir, resource[:name])
+    @servicedir
+  end
+
+  # returns the full path of this service when enabled
+  # (ie in the service directory)
+  def service
+    File.join(self.servicedir, resource[:name])
+  end
+
+  # returns the full path to the current daemon directory
+  # note that this path can be overriden in the resource
+  # definition
+  def daemon
+    File.join(resource[:path], resource[:name])
+  end
+
+  def status
+    begin
+      output = svstat self.service
+      if output =~ /:\s+up \(/
+        return :running
+      end
+    rescue Puppet::ExecutionFailure => detail
+      raise Puppet::Error.new( "Could not get status for service #{resource.ref}: #{detail}" )
     end
-
-    # returns the full path to the current daemon directory
-    # note that this path can be overriden in the resource
-    # definition
-    def daemon
-        File.join(resource[:path], resource[:name])
+    :stopped
+  end
+
+  def setupservice
+      if resource[:manifest]
+        Puppet.notice "Configuring #{resource[:name]}"
+        command = [ resource[:manifest], resource[:name] ]
+        #texecute("setupservice", command)
+        rv = system("#{command}")
+      end
+  rescue Puppet::ExecutionFailure => detail
+      raise Puppet::Error.new( "Cannot config #{self.service} to enable it: #{detail}" )
+  end
+
+  def enabled?
+    case self.status
+    when :running
+      # obviously if the daemon is running then it is enabled
+      return :true
+    else
+      # the service is enabled if it is linked
+      return FileTest.symlink?(self.service) ? :true : :false
     end
-
-    def status
-        begin
-            output = svstat self.service
-            if output =~ /:\s+up \(/
-                return :running
-            end
-        rescue Puppet::ExecutionFailure => detail
-            raise Puppet::Error.new( "Could not get status for service %s: %s" % [ resource.ref, detail] )
+  end
+
+  def enable
+      if ! FileTest.directory?(self.daemon)
+        Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
+        self.setupservice
+      end
+      if self.daemon
+        if ! FileTest.symlink?(self.service)
+          Puppet.notice "Enabling #{self.service}: linking #{self.daemon} -> #{self.service}"
+          File.symlink(self.daemon, self.service)
         end
-        return :stopped
-    end
-
-    def setupservice
-        begin
-            if resource[:manifest]
-                Puppet.notice "Configuring %s" % resource[:name]
-                command = [ resource[:manifest], resource[:name] ]
-                #texecute("setupservice", command)
-                rv = system("#{command}")
-            end
-        rescue Puppet::ExecutionFailure => detail
-            raise Puppet::Error.new( "Cannot config %s to enable it: %s" % [ self.service, detail ] )
+      end
+  rescue Puppet::ExecutionFailure => detail
+      raise Puppet::Error.new( "No daemon directory found for #{self.service}")
+  end
+
+  def disable
+    begin
+      if ! FileTest.directory?(self.daemon)
+        Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
+        self.setupservice
+      end
+      if self.daemon
+        if FileTest.symlink?(self.service)
+          Puppet.notice "Disabling #{self.service}: removing link #{self.daemon} -> #{self.service}"
+          File.unlink(self.service)
         end
+      end
+    rescue Puppet::ExecutionFailure => detail
+      raise Puppet::Error.new( "No daemon directory found for #{self.service}")
     end
+    self.stop
+  end
 
-    def enabled?
-        case self.status
-        when :running
-            # obviously if the daemon is running then it is enabled
-            return :true
-        else
-            # the service is enabled if it is linked
-            return FileTest.symlink?(self.service) ? :true : :false
-        end
-    end
+  def restart
+    svc "-t", self.service
+  end
 
-    def enable
-        begin
-            if ! FileTest.directory?(self.daemon)
-                Puppet.notice "No daemon dir, calling setupservice for %s" % resource[:name]
-                self.setupservice
-            end
-            if self.daemon
-                if ! FileTest.symlink?(self.service)
-                    Puppet.notice "Enabling %s: linking %s -> %s" % [ self.service, self.daemon, self.service ]
-                    File.symlink(self.daemon, self.service)
-                end
-            end
-        rescue Puppet::ExecutionFailure => detail
-            raise Puppet::Error.new( "No daemon directory found for %s" % self.service )
-        end
-    end
-
-    def disable
-        begin
-            if ! FileTest.directory?(self.daemon)
-                Puppet.notice "No daemon dir, calling setupservice for %s" % resource[:name]
-                self.setupservice
-            end
-            if self.daemon
-                if FileTest.symlink?(self.service)
-                    Puppet.notice "Disabling %s: removing link %s -> %s" % [ self.service, self.daemon, self.service ]
-                    File.unlink(self.service)
-                end
-            end
-        rescue Puppet::ExecutionFailure => detail
-            raise Puppet::Error.new( "No daemon directory found for %s" % self.service )
-        end
-        self.stop
-    end
+  def start
+    enable unless enabled? == :true
+    svc "-u", self.service
+  end
 
-    def restart
-        svc "-t", self.service
-    end
-
-    def start
-        enable unless enabled? == :true
-        svc "-u", self.service
-    end
-
-    def stop
-        svc "-d", self.service
-    end
+  def stop
+    svc "-d", self.service
+  end
 end

data/lib/puppet/provider/service/debian.rb

@@ -1,48 +1,48 @@
 # Manage debian services.  Start/stop is the same as InitSvc, but enable/disable
 # is special.
 Puppet::Type.type(:service).provide :debian, :parent => :init do
-    desc "Debian's form of ``init``-style management.
+  desc "Debian's form of ``init``-style management.
 
-    The only difference is that this supports service enabling and disabling
-    via ``update-rc.d`` and determines enabled status via ``invoke-rc.d``.
+  The only difference is that this supports service enabling and disabling
+  via ``update-rc.d`` and determines enabled status via ``invoke-rc.d``.
 
-    "
+  "
 
-    commands :update_rc => "/usr/sbin/update-rc.d"
-    # note this isn't being used as a command until
-    # http://projects.puppetlabs.com/issues/2538
-    # is resolved.
-    commands :invoke_rc => "/usr/sbin/invoke-rc.d"
-    
-    defaultfor :operatingsystem => [:debian, :ubuntu]
+  commands :update_rc => "/usr/sbin/update-rc.d"
+  # note this isn't being used as a command until
+  # http://projects.reductivelabs.com/issues/2538
+  # is resolved.
+  commands :invoke_rc => "/usr/sbin/invoke-rc.d"
 
-    def self.defpath
-        superclass.defpath
-    end
+  defaultfor :operatingsystem => [:debian, :ubuntu]
 
-    # Remove the symlinks
-    def disable
-        update_rc "-f", @resource[:name], "remove"
-        update_rc @resource[:name], "stop", "00", "1", "2", "3", "4", "5", "6", "."
-    end
+  def self.defpath
+    superclass.defpath
+  end
 
-    def enabled?
-        # TODO: Replace system() call when Puppet::Util.execute gives us a way
-        # to determine exit status.  http://projects.puppetlabs.com/issues/2538
-        system("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start")
-        
-        # 104 is the exit status when you query start an enabled service.
-        # 106 is the exit status when the policy layer supplies a fallback action
-        # See x-man-page://invoke-rc.d
-        if [104, 106].include?($?.exitstatus)
-            return :true
-        else
-            return :false
-        end
-    end
+  # Remove the symlinks
+  def disable
+    update_rc "-f", @resource[:name], "remove"
+    update_rc @resource[:name], "stop", "00", "1", "2", "3", "4", "5", "6", "."
+  end
 
-    def enable
-        update_rc "-f", @resource[:name], "remove"
-        update_rc @resource[:name], "defaults"
+  def enabled?
+    # TODO: Replace system call when Puppet::Util.execute gives us a way
+    # to determine exit status.  http://projects.reductivelabs.com/issues/2538
+    system("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start")
+
+    # 104 is the exit status when you query start an enabled service.
+    # 106 is the exit status when the policy layer supplies a fallback action
+    # See x-man-page://invoke-rc.d
+    if [104, 106].include?($CHILD_STATUS.exitstatus)
+      return :true
+    else
+      return :false
     end
+  end
+
+  def enable
+    update_rc "-f", @resource[:name], "remove"
+    update_rc @resource[:name], "defaults"
+  end
 end