puppet 0.24.9 → 0.25.0

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

@@ -5,7 +5,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
     Uses ``rc-update`` for service enabling and disabling.
 
-  "
+    "
 
     commands :update => "/sbin/rc-update"
 
@@ -38,7 +38,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
         return :false unless line
 
         # If it's enabled then it will print output showing service | runlevel
-        if output =~ /#{@resource[:name]}\s*\|\s*(boot|default)/
+        if output =~ /^\s*#{@resource[:name]}\s*\|\s*(boot|default)/
             return :true
         else
             return :false

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

@@ -15,9 +15,9 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     end
 
     case Facter["operatingsystem"].value
-    when "FreeBSD":
+    when "FreeBSD"
         @defpath = ["/etc/rc.d", "/usr/local/etc/rc.d"]
-    when "HP-UX":
+    when "HP-UX"
         @defpath = "/sbin/init.d"
     else
         @defpath = "/etc/init.d"
@@ -29,21 +29,21 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # List all services of this type.
     def self.instances
         self.defpath = [self.defpath] unless self.defpath.is_a? Array
-        
+
         instances = []
-        
+
         self.defpath.each do |path|
             unless FileTest.directory?(path)
                 Puppet.debug "Service path %s does not exist" % path
                 next
             end
-        
+
             check = [:ensure]
-        
+
             if public_method_defined? :enabled?
                 check << :enable
             end
-            
+
             Dir.entries(path).each do |name|
                 fullpath = File.join(path, name)
                 next if name =~ /^\./
@@ -57,8 +57,8 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # Mark that our init script supports 'status' commands.
     def hasstatus=(value)
         case value
-        when true, "true": @parameters[:hasstatus] = true
-        when false, "false": @parameters[:hasstatus] = false
+        when true, "true"; @parameters[:hasstatus] = true
+        when false, "false"; @parameters[:hasstatus] = false
         else
             raise Puppet::Error, "Invalid 'hasstatus' value %s" %
                 value.inspect
@@ -67,20 +67,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
     # Where is our init script?
     def initscript
-        if defined? @initscript
-            return @initscript
-        else
-            @initscript = self.search(@resource[:name])
-        end
-    end
-
-    def restart
-        if @resource[:hasrestart] == :true
-            command = [self.initscript, :restart]
-            texecute("restart", command)
-        else
-            super
-        end
+        @initscript ||= self.search(@resource[:name])
     end
 
     def search(name)
@@ -115,23 +102,24 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
     # The start command is just the init scriptwith 'start'.
     def startcmd
-        [self.initscript, :start]
+        [initscript, :start]
+    end
+
+    # The stop command is just the init script with 'stop'.
+    def stopcmd
+        [initscript, :stop]
+    end
+
+    def restartcmd
+        (@resource[:hasrestart] == :true) && [initscript, :restart]
     end
 
     # If it was specified that the init script has a 'status' command, then
     # we just return that; otherwise, we return false, which causes it to
     # fallback to other mechanisms.
     def statuscmd
-        if @resource[:hasstatus] == :true
-            return [self.initscript, :status]
-        else
-            return false
-        end
+        (@resource[:hasstatus] == :true) && [initscript, :status]
     end
 
-    # The stop command is just the init script with 'stop'.
-    def stopcmd
-        [self.initscript, :stop]
-    end
 end
 

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

@@ -2,29 +2,29 @@ require 'facter/util/plist'
 
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
     desc "launchd service management framework.
-    
+
     This provider manages launchd jobs, the default service framework for
     Mac OS X, that has also been open sourced by Apple for possible use on
     other platforms.
-    
+
     See:
      * http://developer.apple.com/macosx/launchd.html
      * http://launchd.macosforge.org/
-     
+
     This provider reads plists out of the following directories:
      * /System/Library/LaunchDaemons
      * /System/Library/LaunchAgents
      * /Library/LaunchDaemons
      * /Library/LaunchAgents
-     
+
     and builds up a list of services based upon each plists \"Label\" entry.
-     
+
     This provider supports:
      * ensure => running/stopped,
      * enable => true/false
      * status
      * restart
-    
+
     Here is how the Puppet states correspond to launchd states:
      * stopped => job unloaded
      * started => job loaded
@@ -34,49 +34,52 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     Note that this allows you to do something launchctl can't do, which is to
     be in a state of \"stopped/enabled\ or \"running/disabled\".
 
-  "
+    "
 
     commands :launchctl => "/bin/launchctl"
-    
+    commands :sw_vers => "/usr/bin/sw_vers"
+
     defaultfor :operatingsystem => :darwin
     confine :operatingsystem => :darwin
-    
+
     has_feature :enableable
-    
+
     Launchd_Paths = ["/Library/LaunchAgents",
                      "/Library/LaunchDaemons",
                      "/System/Library/LaunchAgents",
                      "/System/Library/LaunchDaemons",]
 
+    Launchd_Overrides = "/var/db/launchd.db/com.apple.launchd/overrides.plist"
+
 
     # returns a label => path map for either all jobs, or just a single
     # job if the label is specified
     def self.jobsearch(label=nil)
-       label_to_path_map = {}
-       Launchd_Paths.each do |path|
-           if FileTest.exists?(path)
-               Dir.entries(path).each do |f|
-                   next if f =~ /^\..*$/
-                   next if FileTest.directory?(f)
-                   fullpath = File.join(path, f)
-                   job = Plist::parse_xml(fullpath)
-                   if job and job.has_key?("Label")
-                       if job["Label"] == label
-                           return { label => fullpath }
-                       else
-                           label_to_path_map[job["Label"]] = fullpath
-                       end
-                   end
-               end
-           end
-       end
-       
-       # if we didn't find the job above and we should have, error.
-       if label
-           raise Puppet::Error.new("Unable to find launchd plist for job: #{label}")
-       end
-       # if returning all jobs
-       label_to_path_map
+        label_to_path_map = {}
+        Launchd_Paths.each do |path|
+            if FileTest.exists?(path)
+                Dir.entries(path).each do |f|
+                    next if f =~ /^\..*$/
+                    next if FileTest.directory?(f)
+                    fullpath = File.join(path, f)
+                    job = Plist::parse_xml(fullpath)
+                    if job and job.has_key?("Label")
+                        if job["Label"] == label
+                            return { label => fullpath }
+                        else
+                            label_to_path_map[job["Label"]] = fullpath
+                        end
+                    end
+                end
+            end
+        end
+
+        # if we didn't find the job above and we should have, error.
+        if label
+            raise Puppet::Error.new("Unable to find launchd plist for job: #{label}")
+        end
+        # if returning all jobs
+        label_to_path_map
     end
 
 
@@ -86,6 +89,36 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
             new(:name => job, :provider => :launchd, :path => jobs[job])
         end
     end
+    
+    
+    def self.get_macosx_version_major
+        if defined? @macosx_version_major
+            return @macosx_version_major
+        end
+        begin
+            # Make sure we've loaded all of the facts
+            Facter.loadfacts
+
+            if Facter.value(:macosx_productversion_major)
+                product_version_major = Facter.value(:macosx_productversion_major)
+            else
+                # TODO: remove this code chunk once we require Facter 1.5.5 or higher.
+                Puppet.warning("DEPRECATION WARNING: Future versions of the launchd provider will require Facter 1.5.5 or newer.")            
+                product_version = Facter.value(:macosx_productversion)
+                if product_version.nil?
+                    fail("Could not determine OS X version from Facter")
+                end
+                product_version_major = product_version.scan(/(\d+)\.(\d+)./).join(".")
+            end
+            if %w{10.0 10.1 10.2 10.3}.include?(product_version_major)
+                fail("%s is not supported by the launchd provider" % product_version_major)
+            end
+            @macosx_version_major = product_version_major
+            return @macosx_version_major
+        rescue Puppet::ExecutionFailure => detail
+            fail("Could not determine OS X version: %s" % detail)
+        end
+    end
 
 
     # finds the path for a given label and returns the path and parsed plist
@@ -129,7 +162,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
         job_path, job_plist = plist_from_label(resource[:name])
         did_enable_job = false
         cmds = []
-        cmds << :launchctl << :load 
+        cmds << :launchctl << :load
         if self.enabled? == :false  # launchctl won't load disabled jobs
             cmds << "-w"
             did_enable_job = true
@@ -143,7 +176,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
         # As load -w clears the Disabled flag, we need to add it in after
         if did_enable_job and resource[:enable] == :false
             self.disable
-        end 
+        end
     end
 
 
@@ -151,7 +184,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
         job_path, job_plist = plist_from_label(resource[:name])
         did_disable_job = false
         cmds = []
-        cmds << :launchctl << :unload 
+        cmds << :launchctl << :unload
         if self.enabled? == :true # keepalive jobs can't be stopped without disabling
             cmds << "-w"
             did_disable_job = true
@@ -171,33 +204,72 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
 
     # launchd jobs are enabled by default. They are only disabled if the key
     # "Disabled" is set to true, but it can also be set to false to enable it.
+    # In 10.6, the Disabled key in the job plist is consulted, but only if there
+    # is no entry in the global overrides plist.
+    # We need to draw a distinction between undefined, true and false for both
+    # locations where the Disabled flag can be defined.
     def enabled?
+        job_plist_disabled = nil
+        overrides_disabled = nil
+        
         job_path, job_plist = plist_from_label(resource[:name])
         if job_plist.has_key?("Disabled")
-            if job_plist["Disabled"]  # inverse of disabled is enabled
-                return :false
+            job_plist_disabled = job_plist["Disabled"]
+        end
+        
+        if self.class.get_macosx_version_major == "10.6":
+            overrides = Plist::parse_xml(Launchd_Overrides)
+        
+            unless overrides.nil?
+                if overrides.has_key?(resource[:name])
+                    if overrides[resource[:name]].has_key?("Disabled")
+                        overrides_disabled = overrides[resource[:name]]["Disabled"]
+                    end
+                end
+            end
+        end
+        
+        if overrides_disabled.nil?
+            if job_plist_disabled.nil? or job_plist_disabled == false
+                return :true
             end
+        elsif overrides_disabled == false
+            return :true
         end
-        return :true
+        return :false
     end
 
 
     # enable and disable are a bit hacky. We write out the plist with the appropriate value
     # rather than dealing with launchctl as it is unable to change the Disabled flag
     # without actually loading/unloading the job.
+    # In 10.6 we need to write out a disabled key to the global overrides plist, in earlier
+    # versions this is stored in the job plist itself.
     def enable
-        job_path, job_plist = plist_from_label(resource[:name])
-        if self.enabled? == :false
-            job_plist.delete("Disabled")
-            Plist::Emit.save_plist(job_plist, job_path)
+        if self.class.get_macosx_version_major == "10.6"
+            overrides = Plist::parse_xml(Launchd_Overrides)
+            overrides[resource[:name]] = { "Disabled" => false }
+            Plist::Emit.save_plist(overrides, Launchd_Overrides)
+        else
+            job_path, job_plist = plist_from_label(resource[:name])
+            if self.enabled? == :false
+                job_plist.delete("Disabled")
+                Plist::Emit.save_plist(job_plist, job_path)
+            end
         end
     end
 
 
     def disable
-        job_path, job_plist = plist_from_label(resource[:name])
-        job_plist["Disabled"] = true
-        Plist::Emit.save_plist(job_plist, job_path)
+        if self.class.get_macosx_version_major == "10.6"
+            overrides = Plist::parse_xml(Launchd_Overrides)
+            overrides[resource[:name]] = { "Disabled" => true }
+            Plist::Emit.save_plist(overrides, Launchd_Overrides)
+        else
+            job_path, job_plist = plist_from_label(resource[:name])
+            job_plist["Disabled"] = true
+            Plist::Emit.save_plist(job_plist, job_path)
+        end
     end
 
 

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

@@ -5,10 +5,10 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
 
     Uses ``chkconfig`` for service enabling and disabling.
 
-  "
+    "
 
     commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service"
- 
+
     defaultfor :operatingsystem => [:redhat, :fedora, :suse, :centos, :sles, :oel, :ovm]
 
     def self.defpath
@@ -37,7 +37,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
         if output =~ /.* off$/
             return :false
         end
-	
+
         return :true
     end
 
@@ -51,26 +51,17 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
                 [self.name, detail]
         end
     end
- 
-    def restart
-        if @resource[:hasrestart] == :true
-              service(@resource[:name], "restart")
-        else
-           super
-        end
+
+    def initscript
+        raise Puppet::Error, "Do not directly call the init script for '%s'; use 'service' instead" % @resource[:name]
     end
 
-    def status
-        if @resource[:hasstatus] == :true
-              begin 
-                  service(@resource[:name], "status")
-                  return :running
-              rescue 
-                  return :stopped
-              end 
-        else
-           super
-        end
+    def statuscmd
+        (@resource[:hasstatus] == :true) && [command(:service), @resource[:name], "status"]
+    end
+
+    def restartcmd
+        (@resource[:hasrestart] == :true) && [command(:service), @resource[:name], "restart"]
     end
 
     def startcmd

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

@@ -11,7 +11,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
    * /var/service
    * /etc/service
 
-  The daemon directory should be placed in a directory that can be 
+  The daemon directory should be placed in a directory that can be
   by default in:
 
    * /etc/sv
@@ -54,16 +54,16 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
 
     # find the service dir on this node
     def servicedir
-      unless defined?(@servicedir) and @servicedir
-        ["/service", "/etc/service","/var/service"].each do |path|
-            if FileTest.exist?(path)
-                @servicedir = path
-                break
+        unless defined?(@servicedir) and @servicedir
+            ["/service", "/etc/service","/var/service"].each do |path|
+                if FileTest.exist?(path)
+                    @servicedir = path
+                    break
+                end
             end
+            raise "Could not find service directory" unless @servicedir
         end
-        raise "Could not find service directory" unless @servicedir
-      end
-      @servicedir
+        @servicedir
     end
 
     def restartcmd
@@ -91,6 +91,16 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do
         [ command(:sv), "stop", self.service]
     end
 
+    # relay to the startcmd
+    def start
+        enable unless enabled?
+        ucommand( :start )
+    end
+
+    def startcmd
+        [ command(:sv), "start", self.service]
+    end
+
     # disable by removing the symlink so that runit
     # doesn't restart our service behind our back
     # note that runit doesn't need to perform a stop