puppet 2.7.3 → 2.7.4

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

@@ -1,4 +1,3 @@
-
 # Whole new package, so include pack stuff
 require 'puppet/provider/package'
 
@@ -9,243 +8,234 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     Use the port's full origin as the resource name. eg (ports-mgmt/portupgrade)
     for the portupgrade port."
 
-    ## has_features is usually autodetected based on defs below.
-    # has_features :installable, :uninstallable, :upgradeable
+  ## has_features is usually autodetected based on defs below.
+  # has_features :installable, :uninstallable, :upgradeable
 
-    commands :portupgrade   => "/usr/local/sbin/portupgrade",
-      :portinstall   => "/usr/local/sbin/portinstall",
-      :portversion   => "/usr/local/sbin/portversion",
-      :portuninstall => "/usr/local/sbin/pkg_deinstall",
-      :portinfo      => "/usr/sbin/pkg_info"
+  commands :portupgrade   => "/usr/local/sbin/portupgrade",
+  :portinstall   => "/usr/local/sbin/portinstall",
+  :portversion   => "/usr/local/sbin/portversion",
+  :portuninstall => "/usr/local/sbin/pkg_deinstall",
+  :portinfo      => "/usr/sbin/pkg_info"
 
-    ## Activate this only once approved by someone important.
-    # defaultfor :operatingsystem => :freebsd
+  ## Activate this only once approved by someone important.
+  # defaultfor :operatingsystem => :freebsd
 
-    # Remove unwanted environment variables.
-    %w{INTERACTIVE UNAME}.each do |var|
-      if ENV.include?(var)
-        ENV.delete(var)
-        end
-    end	
+  # Remove unwanted environment variables.
+  %w{INTERACTIVE UNAME}.each do |var|
+    if ENV.include?(var)
+      ENV.delete(var)
+    end
+  end
 
-    ######## instances sub command (builds the installed packages list)
+  ######## instances sub command (builds the installed packages list)
 
-    def self.instances
-      Puppet.debug "portupgrade.rb Building packages list from installed ports"
+  def self.instances
+    Puppet.debug "portupgrade.rb Building packages list from installed ports"
 
-      # regex to match output from pkg_info
-      regex = %r{^(\S+)-([^-\s]+):(\S+)$}
-      # Corresponding field names
-      fields = [:portname, :ensure, :portorigin]
-      # define Temporary hash used, packages array of hashes
-      hash = Hash.new
-      packages = []
+    # regex to match output from pkg_info
+    regex = %r{^(\S+)-([^-\s]+):(\S+)$}
+    # Corresponding field names
+    fields = [:portname, :ensure, :portorigin]
+    # define Temporary hash used, packages array of hashes
+    hash = Hash.new
+    packages = []
 
-      # exec command
-      cmdline = ["-aoQ"]
-      begin
-        output = portinfo(*cmdline)
-        rescue Puppet::ExecutionFailure
-          raise Puppet::Error.new(output)
-          return nil
-        end
+    # exec command
+    cmdline = ["-aoQ"]
+    begin
+      output = portinfo(*cmdline)
+    rescue Puppet::ExecutionFailure
+      raise Puppet::Error.new(output)
+      return nil
+    end
 
-        # split output and match it and populate temp hash
-        output.split("\n").each { |data|
-        #         reset hash to nil for each line
-        hash.clear
-        if match = regex.match(data)
-        #                 Output matched regex
+    # split output and match it and populate temp hash
+    output.split("\n").each { |data|
+      # reset hash to nil for each line
+      hash.clear
+      if match = regex.match(data)
+        # Output matched regex
         fields.zip(match.captures) { |field, value|
           hash[field] = value
-            }
-
-            # populate the actual :name field from the :portorigin
-            # Set :provider to this object name
-            hash[:name] = hash[:portorigin]
-            hash[:provider] = self.name
-
-            # Add to the full packages listing
-            packages << new(hash)
-
-            else
-            #         unrecognised output from pkg_info
-            Puppet.debug "portupgrade.Instances() - unable to match output: #{data}"
-            end
         }
 
-        # return the packages array of hashes
-        return packages
+        # populate the actual :name field from the :portorigin
+        # Set :provider to this object name
+        hash[:name] = hash[:portorigin]
+        hash[:provider] = self.name
 
-    end
+        # Add to the full packages listing
+        packages << new(hash)
+      else
+        # unrecognised output from pkg_info
+        Puppet.debug "portupgrade.Instances() - unable to match output: #{data}"
+      end
+    }
+
+    # return the packages array of hashes
+    return packages
+  end
 
-    ######## Installation sub command
+  ######## Installation sub command
 
-    def install
-      Puppet.debug "portupgrade.install() - Installation call on #{@resource[:name]}"
-      # -M: yes, we're a batch, so don't ask any questions
-    	cmdline = ["-M BATCH=yes", @resource[:name]]
+  def install
+    Puppet.debug "portupgrade.install() - Installation call on #{@resource[:name]}"
+    # -M: yes, we're a batch, so don't ask any questions
+    cmdline = ["-M BATCH=yes", @resource[:name]]
 
-    #         FIXME: it's possible that portinstall prompts for data so locks up.
+    # FIXME: it's possible that portinstall prompts for data so locks up.
     begin
       output = portinstall(*cmdline)
-        rescue Puppet::ExecutionFailure
-          raise Puppet::Error.new(output)
-        end
-
-        if output =~ /\*\* No such /
-          raise Puppet::ExecutionFailure, "Could not find package #{@resource[:name]}"
-        end
+    rescue Puppet::ExecutionFailure
+      raise Puppet::Error.new(output)
+    end
 
-        # No return code required, so do nil to be clean
-        return nil
+    if output =~ /\*\* No such /
+      raise Puppet::ExecutionFailure, "Could not find package #{@resource[:name]}"
     end
 
-    ######## Latest subcommand (returns the latest version available, or current version if installed is latest)
+    # No return code required, so do nil to be clean
+    return nil
+  end
 
-    def latest
-      Puppet.debug "portupgrade.latest() - Latest check called on #{@resource[:name]}"
-      # search for latest version available, or return current version.
-      # cmdline = "portversion -v <portorigin>", returns "<portname> <code> <stuff>"
-      # or "** No matching package found: <portname>"
-    	cmdline = ["-v", @resource[:name]]
+  ######## Latest subcommand (returns the latest version available, or current version if installed is latest)
 
-      begin
-        output = portversion(*cmdline)
-        rescue Puppet::ExecutionFailure
-          raise Puppet::Error.new(output)
-        end
+  def latest
+    Puppet.debug "portupgrade.latest() - Latest check called on #{@resource[:name]}"
+    # search for latest version available, or return current version.
+    # cmdline = "portversion -v <portorigin>", returns "<portname> <code> <stuff>"
+    # or "** No matching package found: <portname>"
+    cmdline = ["-v", @resource[:name]]
 
-        # Check: output format.
-        if output =~ /^\S+-([^-\s]+)\s+(\S)\s+(.*)/
-        #         $1 = installed version, $2 = comparison, $3 other data
-        # latest installed
-        installedversion = $1
-        comparison = $2
-        otherdata = $3
-
-        # Only return a new version number when it's clear that there is a new version
-        # all others return the current version so no unexpected 'upgrades' occur.	
-        case comparison
-        when "=", ">"
-          Puppet.debug "portupgrade.latest() - Installed package is latest (#{installedversion})"
-          return installedversion
-            when "<"
-            #         "portpkg-1.7_5  <  needs updating (port has 1.14)"
-            # "portpkg-1.7_5  <  needs updating (port has 1.14) (=> 'newport/pkg')
-            if otherdata =~ /\(port has (\S+)\)/
-              newversion = $1
-              Puppet.debug "portupgrade.latest() - Installed version needs updating to (#{newversion})"
-              return newversion
-                else
-                  Puppet.debug "portupgrade.latest() - Unable to determine new version from (#{otherdata})"
-                  return installedversion
-                end
-            when "?", "!", "#"
-              Puppet.debug "portupgrade.latest() - Comparison Error reported from portversion (#{output})"
-              return installedversion
-            else
-              Puppet.debug "portupgrade.latest() - Unknown code from portversion output (#{output})"
-              return installedversion
-            end
+    begin
+      output = portversion(*cmdline)
+    rescue Puppet::ExecutionFailure
+      raise Puppet::Error.new(output)
+    end
 
+    # Check: output format.
+    if output =~ /^\S+-([^-\s]+)\s+(\S)\s+(.*)/
+      installedversion = $1
+      comparison = $2
+      otherdata = $3
+
+      # Only return a new version number when it's clear that there is a new version
+      # all others return the current version so no unexpected 'upgrades' occur.
+      case comparison
+      when "=", ">"
+        Puppet.debug "portupgrade.latest() - Installed package is latest (#{installedversion})"
+        return installedversion
+      when "<"
+        # "portpkg-1.7_5 < needs updating (port has 1.14)"
+        # "portpkg-1.7_5 < needs updating (port has 1.14) (=> 'newport/pkg')
+        if otherdata =~ /\(port has (\S+)\)/
+          newversion = $1
+          Puppet.debug "portupgrade.latest() - Installed version needs updating to (#{newversion})"
+          return newversion
         else
-        #         error: output not parsed correctly, error out with nil.
-        # Seriously - this section should never be called in a perfect world.
-        # as verification that the port is installed has already happened in query.
-        if output =~ /^\*\* No matching package /
-          raise Puppet::ExecutionFailure, "Could not find package #{@resource[:name]}"
-            else
-            #         Any other error (dump output to log)
-            raise Puppet::ExecutionFailure, "Unexpected output from portversion: #{output}"
-            end
-
-            # Just in case we still are running, return nil
-            return nil
+          Puppet.debug "portupgrade.latest() - Unable to determine new version from (#{otherdata})"
+          return installedversion
         end
+      when "?", "!", "#"
+        Puppet.debug "portupgrade.latest() - Comparison Error reported from portversion (#{output})"
+        return installedversion
+      else
+        Puppet.debug "portupgrade.latest() - Unknown code from portversion output (#{output})"
+        return installedversion
+      end
 
-        # At this point normal operation has finished and we shouldn't have been called.
-        # Error out and let the admin deal with it.
-        raise Puppet::Error, "portversion.latest() - fatal error with portversion: #{output}"
-        return nil
+    else
+      # error: output not parsed correctly, error out with nil.
+      # Seriously - this section should never be called in a perfect world.
+      # as verification that the port is installed has already happened in query.
+      if output =~ /^\*\* No matching package /
+        raise Puppet::ExecutionFailure, "Could not find package #{@resource[:name]}"
+      else
+        # Any other error (dump output to log)
+        raise Puppet::ExecutionFailure, "Unexpected output from portversion: #{output}"
+      end
 
+      # Just in case we still are running, return nil
+      return nil
     end
 
-    ###### Query subcommand - return a hash of details if exists, or nil if it doesn't.
-    # Used to make sure the package is installed
+    # At this point normal operation has finished and we shouldn't have been called.
+    # Error out and let the admin deal with it.
+    raise Puppet::Error, "portversion.latest() - fatal error with portversion: #{output}"
+    return nil
+  end
 
-    def query
-      Puppet.debug "portupgrade.query() - Called on #{@resource[:name]}"
+  ###### Query subcommand - return a hash of details if exists, or nil if it doesn't.
+  # Used to make sure the package is installed
 
-      cmdline = ["-qO", @resource[:name]]
-      begin
-        output = portinfo(*cmdline)
-        rescue Puppet::ExecutionFailure
-          raise Puppet::Error.new(output)
-        end
+  def query
+    Puppet.debug "portupgrade.query() - Called on #{@resource[:name]}"
 
-        # Check: if output isn't in the right format, return nil
-        if output =~ /^(\S+)-([^-\s]+)/
-        #         Fill in the details
-        hash = Hash.new
-        hash[:portorigin]	= self.name
-        hash[:portname]		= $1
-        hash[:ensure]		= $2
+    cmdline = ["-qO", @resource[:name]]
+    begin
+      output = portinfo(*cmdline)
+    rescue Puppet::ExecutionFailure
+      raise Puppet::Error.new(output)
+    end
 
-        # If more details are required, then we can do another pkg_info query here
-        # and parse out that output and add to the hash
+    # Check: if output isn't in the right format, return nil
+    if output =~ /^(\S+)-([^-\s]+)/
+      # Fill in the details
+      hash = Hash.new
+      hash[:portorigin] = self.name
+      hash[:portname]   = $1
+      hash[:ensure]     = $2
+
+      # If more details are required, then we can do another pkg_info
+      # query here and parse out that output and add to the hash
+      # return the hash to the caller
+      return hash
+    else
+      Puppet.debug "portupgrade.query() - package (#{@resource[:name]}) not installed"
+      return nil
+    end
+  end
 
-        # return the hash to the caller
-        return hash
-        else
-          Puppet.debug "portupgrade.query() - package (#{@resource[:name]}) not installed"
-          return nil
-        end
+  ####### Uninstall command
 
+  def uninstall
+    Puppet.debug "portupgrade.uninstall() - called on #{@resource[:name]}"
+    # Get full package name from port origin to uninstall with
+    cmdline = ["-qO", @resource[:name]]
+    begin
+      output = portinfo(*cmdline)
+    rescue Puppet::ExecutionFailure
+      raise Puppet::Error.new(output)
     end
 
-    ####### Uninstall command
+    if output =~ /^(\S+)/
+      # output matches, so uninstall it
+      portuninstall $1
+    end
+  end
 
-    def uninstall
-      Puppet.debug "portupgrade.uninstall() - called on #{@resource[:name]}"
-      # Get full package name from port origin to uninstall with
-      cmdline = ["-qO", @resource[:name]]
-      begin
-        output = portinfo(*cmdline)
-        rescue Puppet::ExecutionFailure
-          raise Puppet::Error.new(output)
-        end
+  ######## Update/upgrade command
 
-        if output =~ /^(\S+)/
-        #         output matches, so uninstall it
-    		portuninstall $1
-      end
+  def update
+    Puppet.debug "portupgrade.update() - called on (#{@resource[:name]})"
 
+    cmdline = ["-qO", @resource[:name]]
+    begin
+      output = portinfo(*cmdline)
+    rescue Puppet::ExecutionFailure
+      raise Puppet::Error.new(output)
     end
 
-    ######## Update/upgrade command
-
-    def update
-      Puppet.debug "portupgrade.update() - called on (#{@resource[:name]})"
-
-      cmdline = ["-qO", @resource[:name]]
+    if output =~ /^(\S+)/
+      # output matches, so upgrade the software
+      cmdline = ["-M BATCH=yes", $1]
       begin
-        output = portinfo(*cmdline)
-        rescue Puppet::ExecutionFailure
-          raise Puppet::Error.new(output)
-        end
-
-        if output =~ /^(\S+)/
-        #         output matches, so upgrade the software
-        cmdline = ["-M BATCH=yes", $1]
-        begin
-          output = portupgrade(*cmdline)
-            rescue Puppet::ExecutionFailure
-              raise Puppet::Error.new(output)
-            end
-        end
+        output = portupgrade(*cmdline)
+      rescue Puppet::ExecutionFailure
+        raise Puppet::Error.new(output)
+      end
     end
+  end
 
-## EOF
+  ## EOF
 end
-

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

@@ -1,4 +1,5 @@
 require 'puppet/provider/package'
+
 # RPM packaging.  Should work anywhere that has rpm installed.
 Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Provider::Package do
   desc "RPM packaging support; should work anywhere with a working `rpm`
@@ -129,4 +130,3 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     hash
   end
 end
-

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

@@ -152,4 +152,3 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
     self.install
   end
 end
-

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

@@ -6,6 +6,4 @@ Puppet::Type.type(:package).provide :sunfreeware, :parent => :blastwave, :source
   commands :pkgget => "pkg-get"
 
   confine :operatingsystem => :solaris
-
 end
-

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

@@ -39,4 +39,3 @@ Puppet::Type.type(:package).provide :up2date, :parent => :rpm, :source => :rpm d
     self.install
   end
 end
-

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

@@ -57,4 +57,3 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
     self.install
   end
 end
-

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

@@ -1,4 +1,5 @@
 require 'puppet/util/package'
+
 Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   desc "Support via `yum`."
 
@@ -104,4 +105,3 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     yum "-y", :erase, @resource[:name]
   end
 end
-

data/lib/puppet/provider/package.rb

@@ -1,6 +1,3 @@
-#  Created by Luke A. Kanies on 2007-06-05.
-#  Copyright (c) 2007. All rights reserved.
-
 class Puppet::Provider::Package < Puppet::Provider
   # Prefetch our package list, yo.
   def self.prefetch(packages)
@@ -24,4 +21,8 @@ class Puppet::Provider::Package < Puppet::Provider
     end
     @property_hash.dup
   end
+
+  def validate_source(value)
+    true
+  end
 end

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

@@ -0,0 +1,64 @@
+# Manage systemd services using /bin/systemctl
+
+Puppet::Type.type(:service).provide :systemd, :parent => :base do
+  desc "Manage systemd services using /bin/systemctl"
+
+  commands :systemctl => "/bin/systemctl"
+
+  #defaultfor :operatingsystem => [:redhat, :fedora, :suse, :centos, :sles, :oel, :ovm]
+
+  def self.instances
+    i = []
+    output = `systemctl list-units --full --all --no-pager`
+    output.scan(/^(\S+)\s+(loaded|error)\s+(active|inactive)\s+(active|waiting|running|plugged|mounted|dead|exited|listening|elapsed)\s*?(\S.*?)?$/i).each do |m|
+      i << m[0]
+    end
+    return i
+  rescue Puppet::ExecutionFailure
+    return []
+  end
+
+  def disable
+    output = systemctl(:disable, @resource[:name])
+  rescue Puppet::ExecutionFailure
+    raise Puppet::Error, "Could not disable #{self.name}: #{output}"
+  end
+
+  def enabled?
+    begin
+      systemctl("is-enabled", @resource[:name])
+    rescue Puppet::ExecutionFailure
+      return :false
+    end
+
+    :true
+  end
+
+  def status
+    begin
+      output = systemctl("is-active", @resource[:name])
+    rescue Puppet::ExecutionFailure
+      return :stopped
+    end
+    return :running
+  end
+
+  def enable
+    output = systemctl("enable", @resource[:name])
+  rescue Puppet::ExecutionFailure
+    raise Puppet::Error, "Could not enable #{self.name}: #{output}"
+  end
+
+  def restartcmd
+    [command(:systemctl), "restart", @resource[:name]]
+  end
+
+  def startcmd
+    [command(:systemctl), "start", @resource[:name]]
+  end
+
+  def stopcmd
+    [command(:systemctl), "stop", @resource[:name]]
+  end
+end
+

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

@@ -0,0 +1,110 @@
+# Windows Service Control Manager (SCM) provider
+
+require 'win32/service' if Puppet.features.microsoft_windows?
+
+Puppet::Type.type(:service).provide :windows do
+
+  desc "Support for Windows Service Control Manager (SCM).
+
+  Services are controlled according to win32-service gem.
+
+  * All SCM operations (start/stop/enable/disable/query) are supported.
+
+  * Control of service groups (dependencies) is not yet supported."
+
+  defaultfor :operatingsystem => :windows
+  confine :operatingsystem => :windows
+
+  has_feature :refreshable
+
+  def enable
+    w32ss = Win32::Service.configure( 'service_name' => @resource[:name], 'start_type' => Win32::Service::SERVICE_AUTO_START )
+    raise Puppet::Error.new("Win32 service enable of #{@resource[:name]} failed" ) if( w32ss.nil? )
+  rescue Win32::Service::Error => detail
+    raise Puppet::Error.new("Cannot enable #{@resource[:name]}, error was: #{detail}" )
+  end
+
+  def disable
+    w32ss = Win32::Service.configure( 'service_name' => @resource[:name], 'start_type' => Win32::Service::SERVICE_DISABLED )
+    raise Puppet::Error.new("Win32 service disable of #{@resource[:name]} failed" ) if( w32ss.nil? )
+  rescue Win32::Service::Error => detail
+    raise Puppet::Error.new("Cannot disable #{@resource[:name]}, error was: #{detail}" )
+  end
+
+  def manual_start
+    w32ss = Win32::Service.configure( 'service_name' => @resource[:name], 'start_type' => Win32::Service::SERVICE_DEMAND_START )
+    raise Puppet::Error.new("Win32 service manual enable of #{@resource[:name]} failed" ) if( w32ss.nil? )
+  rescue Win32::Service::Error => detail
+    raise Puppet::Error.new("Cannot enable #{@resource[:name]} for manual start, error was: #{detail}" )
+  end
+
+  def enabled?
+    w32ss = Win32::Service.config_info( @resource[:name] )
+    raise Puppet::Error.new("Win32 service query of #{@resource[:name]} failed" ) unless( !w32ss.nil? && w32ss.instance_of?( Struct::ServiceConfigInfo ) )
+    debug("Service #{@resource[:name]} start type is #{w32ss.start_type}")
+    case w32ss.start_type
+      when Win32::Service.get_start_type(Win32::Service::SERVICE_AUTO_START),
+           Win32::Service.get_start_type(Win32::Service::SERVICE_BOOT_START),
+           Win32::Service.get_start_type(Win32::Service::SERVICE_SYSTEM_START)
+        :true
+      when Win32::Service.get_start_type(Win32::Service::SERVICE_DEMAND_START)
+        :manual
+      when Win32::Service.get_start_type(Win32::Service::SERVICE_DISABLED)
+        :false
+      else
+        raise Puppet::Error.new("Unknown start type: #{w32ss.start_type}")
+    end
+  rescue Win32::Service::Error => detail
+    raise Puppet::Error.new("Cannot get start type for #{@resource[:name]}, error was: #{detail}" )
+  end
+
+  def start
+    if enabled? == :false
+      # If disabled and not managing enable, respect disabled and fail.
+      if @resource[:enable].nil?
+        raise Puppet::Error, "Will not start disabled service #{@resource[:name]} without managing enable. Specify 'enable => false' to override."
+      # Otherwise start. If enable => false, we will later sync enable and
+      # disable the service again.
+      elsif @resource[:enable] == :true
+        enable
+      else
+        manual_start
+      end
+    end
+
+    Win32::Service.start( @resource[:name] )
+  rescue Win32::Service::Error => detail
+    raise Puppet::Error.new("Cannot start #{@resource[:name]}, error was: #{detail}" )
+  end
+
+  def stop
+    Win32::Service.stop( @resource[:name] )
+  rescue Win32::Service::Error => detail
+    raise Puppet::Error.new("Cannot stop #{@resource[:name]}, error was: #{detail}" )
+  end
+
+  def restart
+    self.stop
+    self.start
+  end
+
+  def status
+    w32ss = Win32::Service.status( @resource[:name] )
+    raise Puppet::Error.new("Win32 service query of #{@resource[:name]} failed" ) unless( !w32ss.nil? && w32ss.instance_of?( Struct::ServiceStatus ) )
+    state = case w32ss.current_state
+      when "stopped", "pause pending", "stop pending", "paused" then :stopped
+      when "running", "continue pending", "start pending"       then :running
+      else
+        raise Puppet::Error.new("Unknown service state '#{w32ss.current_state}' for service '#{@resource[:name]}'")
+    end
+    debug("Service #{@resource[:name]} is #{w32ss.current_state}")
+    return state
+  rescue Win32::Service::Error => detail
+    raise Puppet::Error.new("Cannot get status of #{@resource[:name]}, error was: #{detail}" )
+  end
+
+  # returns all providers for all existing services and startup state
+  def self.instances
+    Win32::Service.services.collect { |s| new(:name => s.service_name) }
+  end
+end