puppet 0.24.9 → 0.25.0

data/lib/puppet/provider/package/up2date.rb

@@ -1,4 +1,4 @@
-Puppet.type(:package).provide :up2date, :parent => :rpm, :source => :rpm do
+Puppet::Type.type(:package).provide :up2date, :parent => :rpm, :source => :rpm do
     desc "Support for Red Hat's proprietary ``up2date`` package update
         mechanism."
 

data/lib/puppet/provider/package/yum.rb

@@ -4,7 +4,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     has_feature :versionable
 
     commands :yum => "yum", :rpm => "rpm", :python => "python"
-    
+
     YUMHELPER = File::join(File::dirname(__FILE__), "yumhelper.py")
 
     attr_accessor :latest_info
@@ -100,7 +100,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
         # Install in yum can be used for update, too
         self.install
     end
-     
+
     def purge
         yum "-y", :erase, @resource[:name]
     end

data/lib/puppet/provider/package/yumhelper.py

@@ -43,7 +43,7 @@ def pkg_lists(my):
     # Yum 2.2/2.3 python libraries require a couple of extra function calls to setup package sacks.
     # They also don't have a __version__ attribute
     try:
-	yumver = yum.__version__
+        yumver = yum.__version__
     except AttributeError:
         my.doRepoSetup()
         my.doSackSetup()
@@ -64,7 +64,7 @@ def shell_out():
                 return WEXITSTATUS(rc)
         else:
             # Exit code is None (0), no updates waiting so don't both parsing output
-            return 0 
+            return 0
 
         # Yum prints a line of hyphens (old versions) or a blank line between
         # headers and package data, so skip everything before them

data/lib/puppet/provider/port/parsed.rb

@@ -2,7 +2,7 @@ require 'puppet/provider/parsedfile'
 
 #services = nil
 #case Facter.value(:operatingsystem)
-#when "Solaris": services = "/etc/inet/services"
+#when "Solaris"; services = "/etc/inet/services"
 #else
 #    services = "/etc/services"
 #end

data/lib/puppet/provider/selmodule/semodule.rb

@@ -45,7 +45,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
         end
         return :false
     end
-    
+
     def syncversion= (dosync)
         begin
             execoutput("#{command(:semodule)} --upgrade #{selmod_name_to_filename}")
@@ -115,13 +115,13 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
 
         # At last!  the version
 
-        v = selmod_readnext(mod) 
+        v = selmod_readnext(mod)
 
         self.debug "file version #{v}"
         return v
     end
 
-    def selmodversion_loaded 
+    def selmodversion_loaded
         lines = ()
         begin
             execpipe("#{command(:semodule)} --list") do |output|

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

@@ -7,7 +7,7 @@ Puppet::Type.type(:service).provide :base do
     service.  It is preferable to specify start, stop, and status commands,
     akin to how you would do so using ``init``.
 
-  "
+    "
 
     commands :kill => "kill"
 
@@ -19,13 +19,11 @@ Puppet::Type.type(:service).provide :base do
     # parameter.
     def getpid
         unless @resource[:pattern]
-            @resource.fail "Either a stop command or a pattern must be specified"
+            @resource.fail "Either stop/status commands or a pattern must be specified"
         end
         ps = Facter["ps"].value
         unless ps and ps != ""
-            @resource.fail(
-                "You must upgrade Facter to a version that includes 'ps'"
-            )
+            @resource.fail "You must upgrade Facter to a version that includes 'ps'"
         end
         regex = Regexp.new(@resource[:pattern])
         self.debug "Executing '#{ps}'"
@@ -43,7 +41,7 @@ Puppet::Type.type(:service).provide :base do
 
     # How to restart the process.
     def restart
-        if @resource[:restart] or self.respond_to?(:restartcmd)
+        if @resource[:restart] or restartcmd
             ucommand(:restart)
         else
             self.stop
@@ -51,19 +49,22 @@ Puppet::Type.type(:service).provide :base do
         end
     end
 
+    # There is no default command, which causes other methods to be used  
+    def restartcmd
+    end
+
     # Check if the process is running.  Prefer the 'status' parameter,
     # then 'statuscmd' method, then look in the process table.  We give
     # the object the option to not return a status command, which might
     # happen if, for instance, it has an init script (and thus responds to
     # 'statuscmd') but does not have 'hasstatus' enabled.
     def status
-        if @resource[:status] or (
-            self.respond_to?(:statuscmd) and self.statuscmd
-        )
+        if @resource[:status] or statuscmd
             # Don't fail when the exit status is not 0.
-            output = ucommand(:status, false)
+            ucommand(:status, false)
 
-            if $? == 0
+            # Expicitly calling exitstatus to facilitate testing
+            if $?.exitstatus == 0
                 return :running
             else
                 return :stopped
@@ -76,6 +77,10 @@ Puppet::Type.type(:service).provide :base do
         end
     end
 
+    # There is no default command, which causes other methods to be used  
+    def statuscmd
+    end
+    
     # Run the 'start' parameter command, or the specified 'startcmd'.
     def start
         ucommand(:start)
@@ -98,7 +103,7 @@ Puppet::Type.type(:service).provide :base do
     # for the process in the process table.
     # This method will generally not be overridden by submodules.
     def stop
-        if @resource[:stop] or self.respond_to?(:stopcmd)
+        if @resource[:stop] or stopcmd
             ucommand(:stop)
         else
             pid = getpid
@@ -115,6 +120,10 @@ Puppet::Type.type(:service).provide :base do
             return true
         end
     end
+    
+    # There is no default command, which causes other methods to be used  
+    def stopcmd
+    end
 
     # A simple wrapper so execution failures are a bit more informative.
     def texecute(type, command, fof = true)

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

@@ -11,7 +11,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     * /etc/service
     * /var/lib/svscan
 
-    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:
 
     * /var/lib/service
@@ -31,17 +31,20 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     * 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 => \"stopped\", it will only down the service, not
+    remove the /path/to/service link.
 
-    commands :svc  => "/usr/bin/svc"
-    commands :svstat => "/usr/bin/svstat"
+    """
+
+    commands :svc  => "/usr/bin/svc", :svstat => "/usr/bin/svstat"
 
     class << self
         attr_writer :defpath
-        
-        # this is necessary to autodetect a valid resource
-        # default path, since there is no standard for such directory.
+
+        # Determine the daemon path.
         def defpath
             unless defined?(@defpath) and @defpath
                 ["/var/lib/service", "/etc"].each do |path|
@@ -84,16 +87,16 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
 
     # 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
+        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
-        raise "Could not find service directory" unless @servicedir
-      end
-      @servicedir
+        @servicedir
     end
 
     # returns the full path of this service when enabled
@@ -108,57 +111,91 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     def daemon
         File.join(resource[:path], resource[:name])
     end
-    
-    def restartcmd
-        [ command(:svc), "-t", self.service]
-    end
-
-    # The start command does nothing, service are automatically started
-    # when enabled by svscan. But, forces an enable if necessary
-    def start
-        # to start make sure the sevice is enabled
-        self.enable
-        # start is then automatic
-    end
 
     def status
         begin
             output = svstat self.service
-            return :running if output =~ /\bup\b/
+            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
         return :stopped
     end
 
-    # unfortunately it is not possible
-    # to stop without disabling the service
-    def stop
-        self.disable
+    def startcmd
+        self.enable if ! FileTest.symlink?(self.service)
+        [command(:svc), "-u", self.service ]
     end
 
-    # disable by stopping the service
-    # and removing the symlink so that svscan
-    # doesn't restart our service behind our back
-    def disable
-        # should stop the service
-        # stop the log subservice if any
-        log = File.join(self.service, "log")
-        texecute("stop log", [ command(:svc) , '-dx', log] ) if FileTest.directory?(log)
-        
-        # stop the main resource
-        texecute("stop", [command(:svc), '-dx', self.service] )
-
-        # unlink the daemon symlink to disable it
-        File.unlink(self.service) if FileTest.symlink?(self.service)
+    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
     end
 
     def enabled?
-        FileTest.symlink?(self.service)
+        case self.status
+        when :running:
+            return :true
+        else
+            return :false
+        end
     end
 
     def enable
-        File.symlink(self.daemon, self.service) if ! FileTest.symlink?(self.service)
+        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
-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 restart
+        svc "-t", self.service
+    end
+
+    def start
+        enable unless enabled?
+        svc "-u", self.service
+    end
+
+    def stop
+        svc "-d", self.service
+    end
+end

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

@@ -4,11 +4,16 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
     desc "Debian's form of ``init``-style management.
 
     The only difference is that this supports service enabling and disabling
-    via ``update-rc.d``.
+    via ``update-rc.d`` and determines enabled status via ``invoke-rc.d``.
 
-  "
+    "
 
-    commands :update => "/usr/sbin/update-rc.d"
+    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"
+    
     defaultfor :operatingsystem => [:debian, :ubuntu]
 
     def self.defpath
@@ -17,16 +22,19 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
     # Remove the symlinks
     def disable
-        update "-f", @resource[:name], "remove"
-        update @resource[:name], "stop", "00", "1", "2", "3", "4", "5", "6", "."
+        update_rc "-f", @resource[:name], "remove"
+        update_rc @resource[:name], "stop", "00", "1", "2", "3", "4", "5", "6", "."
     end
 
     def enabled?
-        output = update "-n", "-f", @resource[:name], "remove"
-
-        # If it's enabled, then it will print output showing removal of
-        # links.
-        if output =~ /etc\/rc[\dS].d\/S|not installed/
+        # 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", "--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
@@ -34,7 +42,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
     end
 
     def enable
-        update "-f", @resource[:name], "remove"
-        update @resource[:name], "defaults"
+        update_rc "-f", @resource[:name], "remove"
+        update_rc @resource[:name], "defaults"
     end
 end

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

@@ -5,7 +5,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     Uses ``rc.conf.d`` for service enabling and disabling.
 
 "
- 
+
     confine :operatingsystem => [:freebsd, :netbsd, :openbsd]
 
     defaultfor :operatingsystem => :freebsd
@@ -15,7 +15,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     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])
@@ -23,7 +23,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
             File.delete(rcfile)
         end
     end
-    
+
     # if the service file exists in rc.conf.d then it's already enabled
     def enabled?
         rcfile = File.join(@@rcconf_dir, @model[:name])
@@ -33,7 +33,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
 
         return :false
     end
-    
+
     # enable service by creating a service file under rc.conf.d with the
     # proper contents
     def enable
@@ -43,7 +43,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
         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