puppet 2.7.26 → 3.0.0.rc4

data/lib/puppet/type/file/content.rb

@@ -15,7 +15,7 @@ module Puppet
 
     attr_reader :actual_content
 
-    desc <<-'EOT'
+    desc <<-EOT
       The desired contents of a file, as a string. This attribute is mutually
       exclusive with `source` and `target`.
 
@@ -168,10 +168,6 @@ module Puppet
       }
     end
 
-    def self.standalone?
-      Puppet.settings[:name] == "apply"
-    end
-
     # the content is munged so if it's a checksum source_or_content is nil
     # unless the checksum indirectly comes from source
     def each_chunk_from(source_or_content)
@@ -181,7 +177,7 @@ module Puppet
         yield read_file_from_filebucket
       elsif source_or_content.nil?
         yield ''
-      elsif self.class.standalone?
+      elsif Puppet[:default_file_terminus] == "file_server"
         yield source_or_content.content
       elsif source_or_content.local?
         chunk_file_from_disk(source_or_content) { |chunk| yield chunk }
@@ -204,10 +200,18 @@ module Puppet
       end
     end
 
+    def get_from_source(source_or_content, &block)
+      request = Puppet::Indirector::Request.new(:file_content, :find, source_or_content.full_path.sub(/^\//,''), nil, :environment => resource.catalog.environment)
+
+      request.do_request(:fileserver) do |req|
+        connection = Puppet::Network::HttpPool.http_instance(req.server, req.port)
+        connection.request_get(indirection2uri(req), add_accept_encoding({"Accept" => "raw"}), &block)
+      end
+    end
+
+
     def chunk_file_from_source(source_or_content)
-      request = Puppet::Indirector::Request.new(:file_content, :find, source_or_content.full_path.sub(/^\//,''))
-      connection = Puppet::Network::HttpPool.http_instance(source_or_content.server, source_or_content.port)
-      connection.request_get(indirection2uri(request), add_accept_encoding({"Accept" => "raw"})) do |response|
+      get_from_source(source_or_content) do |response|
         case response.code
         when /^2/;  uncompress(response) { |uncompressor| response.read_body { |chunk| yield uncompressor.uncompress(chunk) } }
         else

data/lib/puppet/type/file/ensure.rb

@@ -5,7 +5,7 @@ module Puppet
     require 'puppet/util/symbolic_file_mode'
     include Puppet::Util::SymbolicFileMode
 
-    desc <<-'EOT'
+    desc <<-EOT
       Whether to create files that don't currently exist.
       Possible values are *absent*, *present*, *file*, and *directory*.
       Specifying `present` will match any form of file existence, and

data/lib/puppet/type/file/mode.rb

@@ -6,7 +6,7 @@ module Puppet
     require 'puppet/util/symbolic_file_mode'
     include Puppet::Util::SymbolicFileMode
 
-    desc <<-'EOT'
+    desc <<-EOT
       The desired permissions mode for the file, in symbolic or numeric
       notation. Puppet uses traditional Unix permission schemes and translates
       them to equivalent permissions for systems which represent permissions

data/lib/puppet/type/file/selcontext.rb

@@ -48,13 +48,9 @@ module Puppet
     def insync?(value)
       if not selinux_support?
         debug("SELinux bindings not found. Ignoring parameter.")
-        true
-      elsif not selinux_label_support?(@resource[:path])
-        debug("SELinux not available for this filesystem. Ignoring parameter.")
-        true
-      else
-        super
+        return true
       end
+      super
     end
 
     def sync

data/lib/puppet/type/file/source.rb

@@ -12,7 +12,7 @@ module Puppet
     include Puppet::Util::Diff
 
     attr_accessor :source, :local
-    desc <<-'EOT'
+    desc <<-EOT
       A source file, which will be copied into place on the local system.
       Values can be URIs pointing to remote files, or fully qualified paths to
       files available on the local system (including files on NFS shares or
@@ -101,7 +101,7 @@ module Puppet
       return @content if @content
       raise Puppet::DevError, "No source for content was stored with the metadata" unless metadata.source
 
-      unless tmp = Puppet::FileServing::Content.indirection.find(metadata.source, :links => resource[:links])
+      unless tmp = Puppet::FileServing::Content.indirection.find(metadata.source, :environment => resource.catalog.environment)
         fail "Could not find any content at %s" % metadata.source
       end
       @content = tmp.content
@@ -154,7 +154,7 @@ module Puppet
       return nil unless value
       value.each do |source|
         begin
-          if data = Puppet::FileServing::Metadata.indirection.find(source, :links => resource[:links])
+          if data = Puppet::FileServing::Metadata.indirection.find(source, :environment => resource.catalog.environment)
             @metadata = data
             @metadata.source = source
             break
@@ -163,7 +163,7 @@ module Puppet
           fail detail, "Could not retrieve file metadata for #{source}: #{detail}"
         end
       end
-      fail "Could not retrieve information from environment #{Puppet[:environment]} source(s) #{value.join(", ")}" unless @metadata
+      fail "Could not retrieve information from environment #{resource.catalog.environment} source(s) #{value.join(", ")}" unless @metadata
       @metadata
     end
 
@@ -175,6 +175,10 @@ module Puppet
       Puppet::Util.uri_to_path(uri) if found?
     end
 
+    def server?
+       uri and uri.host
+    end
+
     def server
       (uri and uri.host) or Puppet.settings[:server]
     end

data/lib/puppet/type/filebucket.rb

@@ -104,8 +104,9 @@ module Puppet
       begin
         @bucket = Puppet::FileBucket::Dipper.new(args)
       rescue => detail
-        puts detail.backtrace if Puppet[:trace]
-        self.fail("Could not create #{type} filebucket: #{detail}")
+        message = "Could not create #{type} filebucket: #{detail}"
+        self.log_exception(detail, message)
+        self.fail(message)
       end
 
       @bucket.name = self.name

data/lib/puppet/type/mount.rb

@@ -128,7 +128,7 @@ module Puppet
 
       # Default to the device but with "dsk" replaced with "rdsk".
       defaultto do
-        if Facter["operatingsystem"].value == "Solaris"
+        if Facter["osfamily"].value == "Solaris"
           device = @resource.value(:device)
           if device =~ %r{/dsk/}
             device.sub(%r{/dsk/}, "/rdsk/")
@@ -199,16 +199,6 @@ module Puppet
       isnamevar
     end
 
-    newparam(:path) do
-      desc "The deprecated name for the mount point.  Please use `name` now."
-
-      def value=(value)
-        warning "'path' is deprecated for mounts.  Please use 'name'."
-        @resource[:name] = value
-        super
-      end
-    end
-
     newparam(:remounts) do
       desc "Whether the mount can be remounted  `mount -o remount`.  If
         this is false, then the filesystem will be unmounted and remounted

data/lib/puppet/type/package.rb

@@ -3,6 +3,8 @@
 # This allows packages to exist on the same machine using different packaging
 # systems.
 
+require 'puppet/parameter/package_options'
+
 module Puppet
   newtype(:package) do
     @doc = "Manage packages.  There is a basic dichotomy in package
@@ -46,6 +48,8 @@ module Puppet
       :methods => [:hold]
     feature :install_options, "The provider accepts options to be
       passed to the installer command."
+    feature :uninstall_options, "The provider accepts options to be
+      passed to the uninstaller command."
 
     ensurable do
       desc <<-EOT
@@ -242,17 +246,6 @@ module Puppet
       desc "A read-only parameter set by the package."
     end
 
-    newparam(:type) do
-      desc "Deprecated form of `provider`."
-
-      munge do |value|
-        warning "'type' is deprecated; use 'provider' instead"
-        @resource[:provider] = value
-
-        @resource[:provider]
-      end
-    end
-
     newparam(:adminfile) do
       desc "A file containing package defaults for installing packages.
         This is currently only used on Solaris.  The value will be
@@ -305,25 +298,49 @@ module Puppet
         further specifications for which type of package you want."
     end
 
-    newparam(:install_options, :required_features => :install_options) do
-      desc <<-'EOT'
-        A hash of additional options to pass when installing a package. These
+    newparam(:install_options, :parent => Puppet::Parameter::PackageOptions, :required_features => :install_options) do
+      desc <<-EOT
+        An array of additional options to pass when installing a package. These
         options are package-specific, and should be documented by the software
-        vendor. The most commonly implemented option is `INSTALLDIR`:
+        vendor.  One commonly implemented option is `INSTALLDIR`:
 
             package { 'mysql':
               ensure          => installed,
-              provider        => 'msi',
               source          => 'N:/packages/mysql-5.5.16-winx64.msi',
-              install_options => { 'INSTALLDIR' => 'C:\\mysql-5.5' },
+              install_options => [ '/S', { 'INSTALLDIR' => 'C:\\mysql-5.5' } ],
             }
 
-        Since these options are passed verbatim to `msiexec`, any file paths
-        specified in `install_options` should use a backslash as the separator
-        character rather than a forward slash. This is the **only** place in Puppet
-        where backslash separators should be used. Note that backslashes in
-        double-quoted strings _must_ be double-escaped and backslashes
-        in single-quoted strings _may_ be double-escaped.
+        Each option in the array can either be a string or a hash, where each
+        key and value pair are interpreted in a provider specific way.  Each
+        option will automatically be quoted when passed to the install command.
+
+        On Windows, this is the **only** place in Puppet where backslash
+        separators should be used.  Note that backslashes in double-quoted
+        strings _must_ be double-escaped and backslashes in single-quoted
+        strings _may_ be double-escaped.
+      EOT
+    end
+
+    newparam(:uninstall_options, :parent => Puppet::Parameter::PackageOptions, :required_features => :uninstall_options) do
+      desc <<-EOT
+        An array of additional options to pass when uninstalling a package. These
+        options are package-specific, and should be documented by the software
+        vendor.  For example:
+
+            package { 'VMware Tools':
+              ensure            => absent,
+              uninstall_options => [ { 'REMOVE' => 'Sync,VSS' } ],
+            }
+
+        Each option in the array can either be a string or a hash, where each
+        key and value pair are interpreted in a provider specific way.  Each
+        option will automatically be quoted when passed to the uninstall
+        command.
+
+        On Windows, this is the **only** place in Puppet where backslash
+        separators should be used.  Note that backslashes in double-quoted
+        strings _must_ be double-escaped and backslashes in single-quoted
+        strings _may_ be double-escaped.
       EOT
     end
 

data/lib/puppet/type/schedule.rb

@@ -1,6 +1,6 @@
 module Puppet
   newtype(:schedule) do
-    @doc = <<-'EOT'
+    @doc = <<-EOT
       Define schedules for Puppet. Resources can be limited to a schedule by using the
       [`schedule`](http://docs.puppetlabs.com/references/latest/metaparameter.html#schedule)
       metaparameter.
@@ -82,7 +82,8 @@ module Puppet
 
         This is mostly useful for restricting certain resources to being
         applied in maintenance windows or during off-peak hours. Multiple
-        ranges can be applied in array context.
+        ranges can be applied in array context. As a convenience when specifying
+        ranges, you may cross midnight (e.g.: range => "22:00 - 04:00").
       EOT
 
       # This is lame; properties all use arrays as values, but parameters don't.
@@ -119,11 +120,6 @@ module Puppet
           [range[0][1], range[1][1]].each do |n|
             raise ArgumentError, "Invalid minute '#{n}'" if n and (n < 0 or n > 59)
           end
-          if range[0][0] > range[1][0]
-            self.fail(("Invalid range #{value}; ") +
-              "ranges cannot span days."
-            )
-          end
           ret << range
         }
 
@@ -143,13 +139,13 @@ module Puppet
             if range[1]
               ary << range[1]
             else
-              ary << now.min
+              ary << 0
             end
 
             if range[2]
               ary << range[2]
             else
-              ary << now.sec
+              ary << 0
             end
 
             time = Time.local(*ary)
@@ -168,17 +164,57 @@ module Puppet
             "Assuming upper limit should be that time the next day"
             )
 
-            ary = limits[1].to_a
-            ary[3] += 1
-            limits[1] = Time.local(*ary)
+            # Find midnight between the two days. Adding one second
+            # to the end of the day is easier than dealing with dates.
+            ary = limits[0].to_a
+            ary[0] = 59
+            ary[1] = 59
+            ary[2] = 23
+            midnight = Time.local(*ary)+1
+
+            # If it is currently between the range start and midnight
+            # we consider that a successful match.
+            if now.between?(limits[0], midnight)
+              # We have to check the weekday match here as it is special-cased
+              # to support day-spanning ranges.
+              if @resource[:weekday]
+                return false unless @resource[:weekday].has_key?(now.wday)
+              end
+              return true
+            end
+
+            # If we didn't match between the starting time and midnight
+            # we must now move our midnight back 24 hours and try
+            # between the new midnight (24 hours prior) and the
+            # ending time.
+            midnight -= 86400
+
+            # Now we compare the current time between midnight and the
+            # end time.
+            if now.between?(midnight, limits[1])
+              # This case is the reason weekday matching is special cased
+              # in the range parameter. If we match a range that has spanned
+              # past midnight we want to match against the weekday when the range
+              # started, not when it currently is.
+              if @resource[:weekday]
+                return false unless @resource[:weekday].has_key?((now - 86400).wday)
+              end
+              return true
+            end
 
-            #self.devfail("Lower limit is above higher limit: %s" %
-            #    limits.inspect
-            #)
+            # If neither of the above matched then we don't match the
+            # range schedule.
+            return false
+          end
+
+          # Check to see if a weekday parameter was specified and, if so,
+          # do we match it or not. If we fail we can stop here.
+          # This is required because spanning ranges forces us to check
+          # weekday within the range parameter.
+          if @resource[:weekday]
+            return false unless @resource[:weekday].has_key?(now.wday)
           end
 
-          #self.info limits.inspect
-          #self.notice now
           return true if now.between?(*limits)
         end
 
@@ -231,13 +267,13 @@ module Puppet
 
       newvalues(:hourly, :daily, :weekly, :monthly, :never)
 
-      @@scale = {
+      ScheduleScales = {
         :hourly => 3600,
         :daily => 86400,
         :weekly => 604800,
         :monthly => 2592000
       }
-      @@methods = {
+      ScheduleMethods = {
         :hourly => :hour,
         :daily => :day,
         :monthly => :month,
@@ -254,7 +290,7 @@ module Puppet
         value = self.value
         case @resource[:periodmatch]
         when :number
-          method = @@methods[value]
+          method = ScheduleMethods[value]
           if method.is_a?(Proc)
             return method.call(previous, now)
           else
@@ -262,7 +298,7 @@ module Puppet
             return now.send(method) != previous.send(method)
           end
         when :distance
-          scale = @@scale[value]
+          scale = ScheduleScales[value]
 
           # If the number of seconds between the two times is greater
           # than the unit of time, we match.  We divide the scale
@@ -309,6 +345,76 @@ module Puppet
       end
     end
 
+    newparam(:weekday) do
+      desc <<-EOT
+        The days of the week in which the schedule should be valid.
+        You may specify the full day name (Tuesday), the three character
+        abbreviation (Tue), or a number corresponding to the day of the
+        week where 0 is Sunday, 1 is Monday, etc. You may pass an array
+        to specify multiple days. If not specified, the day of the week
+        will not be considered in the schedule.
+
+        If you are also using a range match that spans across midnight
+        then this parameter will match the day that it was at the start
+        of the range, not necessarily the day that it is when it matches.
+        For example, consider this schedule:
+
+          schedule { 'maintenance_window':
+            range   => '22:00 - 04:00',
+            weekday => 'Saturday',
+          }
+
+        This will match at 11 PM on Saturday and 2 AM on Sunday, but not
+        at 2 AM on Saturday.
+      EOT
+
+      validate do |values|
+        values = [values] unless values.is_a?(Array)
+        values.each { |value|
+          unless value.is_a?(String) and
+              (value =~ /^[0-6]$/ or value =~ /^(Mon|Tues?|Wed(?:nes)?|Thu(?:rs)?|Fri|Sat(?:ur)?|Sun)(day)?$/i)
+            raise ArgumentError, "%s is not a valid day of the week" % value
+          end
+        }
+      end
+
+      weekdays = {
+        'sun' => 0,
+        'mon' => 1,
+        'tue' => 2,
+        'wed' => 3,
+        'thu' => 4,
+        'fri' => 5,
+        'sat' => 6,
+      }
+
+      munge do |values|
+        values = [values] unless values.is_a?(Array)
+        ret = {}
+
+        values.each { |value|
+           if value =~ /^[0-6]$/
+              index = value.to_i
+           else
+              index = weekdays[value[0,3].downcase]
+           end
+            ret[index] = true
+        }
+        ret
+      end
+
+      def match?(previous, now)
+        # Special case weekday matching with ranges to a no-op here.
+        # If the ranges span days then we can't simply match the current
+        # weekday, as we want to match the weekday as it was when the range
+        # started.  As a result, all of that logic is in range, not here.
+        return true if @resource[:range]
+
+        return true if value.has_key?(now.wday)
+        false
+      end
+    end
+
     def self.instances
       []
     end