puppet 0.24.7 → 0.24.8

data/lib/puppet/rails/resource_tag.rb

@@ -5,4 +5,22 @@ class Puppet::Rails::ResourceTag < ActiveRecord::Base
     def to_label
       "#{self.puppet_tag.name}"
     end  
+
+    # returns an array of hash containing tags of resource
+    def self.find_all_tags_from_resource(db_resource)
+        tags = db_resource.connection.select_all("SELECT t.id, t.resource_id, p.name FROM resource_tags as t INNER JOIN puppet_tags as p ON t.puppet_tag_id=p.id WHERE t.resource_id=%s" % db_resource.id)
+        tags.each do |val|
+            val['resource_id'] = Integer(val['resource_id'])
+        end
+        tags
+    end
+
+    # returns an array of hash containing tags of a host
+    def self.find_all_tags_from_host(db_host)
+        tags = db_host.connection.select_all("SELECT t.id, t.resource_id, p.name FROM resource_tags as t INNER JOIN resources r ON t.resource_id=r.id INNER JOIN puppet_tags as p ON t.puppet_tag_id=p.id WHERE r.host_id=%s" % db_host.id)
+        tags.each do |val|
+            val['resource_id'] = Integer(val['resource_id'])
+        end
+        tags
+    end
 end

data/lib/puppet/reference/report.rb

@@ -20,4 +20,5 @@ reports must be comma-separated.  You can also specify ``none`` to disable
 reports entirely.
 
 Puppet provides multiple report handlers that will process client reports:
+
 "

data/lib/puppet/transaction.rb

@@ -480,7 +480,7 @@ class Transaction
         @catalog.vertices.each do |resource|
             if provider = resource.provider and provider.class.respond_to?(:prefetch)
                 prefetchers[provider.class] ||= {}
-                prefetchers[provider.class][resource.title] = resource
+                prefetchers[provider.class][resource.name] = resource
             end
         end
 

data/lib/puppet/type.rb

@@ -10,6 +10,7 @@ require 'puppet/util/errors'
 require 'puppet/util/log_paths'
 require 'puppet/util/logging'
 require 'puppet/resource_reference'
+require 'puppet/file_collection/lookup'
 
 # see the bottom of the file for the rest of the inclusions
 
@@ -19,6 +20,7 @@ class Type
     include Puppet::Util::Errors
     include Puppet::Util::LogPaths
     include Puppet::Util::Logging
+    include Puppet::FileCollection::Lookup
 
     ###############################
     # Code related to resource type attributes.
@@ -822,10 +824,6 @@ class Type
         end
         @evalcount += 1
 
-        if p = self.provider and p.respond_to?(:prefetch)
-            p.prefetch
-        end
-
         # this only operates on properties, not properties + children
         # it's important that we call retrieve() on the type instance,
         # not directly on the property, because it allows the type to override
@@ -2139,8 +2137,6 @@ class Type
     # In naming methods, I have tried to consistently name the method so
     # that it is clear whether it operates on all attributes (thus has 'attr' in
     # the method name, or whether it operates on a specific type of attributes.
-    attr_accessor :file, :line
-
     attr_writer :title
     attr_writer :noop
 

data/lib/puppet/type/augeas.rb

@@ -19,10 +19,10 @@
 
 Puppet::Type.newtype(:augeas) do
     include Puppet::Util
-    
+
     feature :parse_commands, "Parse the command string"
     feature :need_to_run?, "If the command should run"
-    feature :execute_changes, "Actually make the changes"    
+    feature :execute_changes, "Actually make the changes"
 
     @doc = "Apply the changes (single or array of changes) to the filesystem
         via the augeas tool.
@@ -59,7 +59,7 @@ Puppet::Type.newtype(:augeas) do
 
     newparam (:context) do
         desc "Optional context path. This value is pre-pended to the paths of all changes"
-        defaultto ""        
+        defaultto ""
     end
 
     newparam (:onlyif) do
@@ -81,7 +81,7 @@ Puppet::Type.newtype(:augeas) do
                AN_ARRAY is in the form ['a string', 'another']"
         defaultto ""
     end
-    
+
 
     newparam(:changes) do
         desc "The changes which should be applied to the filesystem. This
@@ -92,12 +92,13 @@ Puppet::Type.newtype(:augeas) do
           rm [PATH]              Removes the node at location PATH
           remove [PATH]          Synonym for rm
           clear [PATH]           Keeps the node at PATH, but removes the value.
-          ins [PATH]             Inserts an empty node at PATH.
-          insert [PATH]          Synonym for ins
+          ins [LABEL] [WHERE] [PATH]
+                                 Inserts an empty node LABEL either [WHERE={before|after}] PATH.
+          insert [LABEL] [WHERE] [PATH]
+                                 Synonym for ins
+        If the parameter 'context' is set that value is prepended to PATH"
 
-        If the parameter 'context' is set that that value is prepended to PATH"
-
-        munge do |value|    
+        munge do |value|
             provider.parse_commands(value)
         end
     end
@@ -113,6 +114,13 @@ Puppet::Type.newtype(:augeas) do
         defaultto ""
     end
 
+    newparam(:force) do
+        desc "Optional command to force the augeas type to execute even if it thinks changes
+        will not be made. This does not overide the only setting. If onlyif is set, then the
+        foce setting will not override that result"
+
+        defaultto false
+    end
 
     newparam(:type_check) do
         desc "Set to true if augeas should perform typechecking. Optional, defaults to false"
@@ -120,7 +128,7 @@ Puppet::Type.newtype(:augeas) do
 
         defaultto :false
     end
-    
+
     # This is the acutal meat of the code. It forces
     # augeas to be run and fails or not based on the augeas return
     # code.
@@ -129,12 +137,12 @@ Puppet::Type.newtype(:augeas) do
         desc "The expected return code from the augeas command. Should not be set"
 
         defaultto 0
-        
+
         # Make output a bit prettier
         def change_to_s(currentvalue, newvalue)
             return "executed successfully"
-        end        
-        
+        end
+
         # if the onlyif resource is provided, then the value is parsed.
         # a return value of 0 will stop exection becuase it matches the
         # default value.
@@ -144,12 +152,12 @@ Puppet::Type.newtype(:augeas) do
             else
                 0
             end
-        end            
+        end
 
         # Actually execute the command.
         def sync
             @resource.provider.execute_changes()
         end
-    end    
+    end
 
 end

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

@@ -11,7 +11,13 @@ Puppet::Type.type(:file).newproperty(:checksum) do
         like Tripwire without managing the file contents in any way.  You can
         specify that a file's checksum should be monitored and then subscribe to
         the file from another object and receive events to signify
-        checksum changes, for instance."
+        checksum changes, for instance.
+        
+        There are a number of checksum types available including MD5 hashing (and
+        an md5lite variation that only hashes the first 500 characters of the 
+        file.
+   
+        The default checksum parameter, if checksums are enabled, is md5."
 
     @event = :file_changed
 
@@ -37,11 +43,6 @@ Puppet::Type.type(:file).newproperty(:checksum) do
         handlesum()
     end
 
-    newvalue(:nosum) do
-        # nothing
-        :nochange
-    end
-
     # If they pass us a sum type, behave normally, but if they pass
     # us a sum type + sum, stick the sum in the cache.
     munge do |value|
@@ -129,35 +130,6 @@ Puppet::Type.type(:file).newproperty(:checksum) do
         cache(checktype())
     end
 
-    # Retrieve the cached sum
-    def getcachedsum
-        hash = nil
-        unless hash = @resource.cached(:checksums) 
-            hash = {}
-            @resource.cache(:checksums, hash)
-        end
-
-        sumtype = self.should
-
-        if hash.include?(sumtype)
-            #self.notice "Found checksum %s for %s" %
-            #    [hash[sumtype] ,@resource[:path]]
-            sum = hash[sumtype]
-
-            unless sum =~ /^\{\w+\}/
-                sum = "{%s}%s" % [sumtype, sum]
-            end
-            return sum
-        elsif hash.empty?
-            #self.notice "Could not find sum of type %s" % sumtype
-            return :nosum
-        else
-            #self.notice "Found checksum for %s but not of type %s" %
-            #    [@resource[:path],sumtype]
-            return :nosum
-        end
-    end
-
     # Calculate the sum from disk.
     def getsum(checktype, file = nil)
         sum = ""

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

@@ -22,14 +22,17 @@ module Puppet
             This attribute is especially useful when used with
             `PuppetTemplating templating`:trac:."
 
-        def change_to_s(currentvalue, newvalue)
-            newvalue = "{md5}" + Digest::MD5.hexdigest(newvalue)
-            if currentvalue == :absent
-                return "created file with contents %s" % newvalue
-            else
-                currentvalue = "{md5}" + Digest::MD5.hexdigest(currentvalue)
-                return "changed file contents from %s to %s" % [currentvalue, newvalue]
-            end
+        def string_as_checksum(string)
+            return "absent" if string == :absent
+            "{md5}" + Digest::MD5.hexdigest(string)
+        end
+
+        def should_to_s(should)
+            string_as_checksum(should)
+        end
+
+        def is_to_s(is)
+            string_as_checksum(is)
         end
 
         # Override this method to provide diffs if asked for.

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

@@ -44,6 +44,14 @@ module Puppet
             return property_default
         end
 
+        def insync?(value)
+            if not selinux_support?
+              debug("SELinux bindings not found. Ignoring parameter.")
+              return true
+            end
+            super
+        end
+
         def sync
             self.set_selinux_context(@resource[:path], @should, name)
             return :file_changed

data/lib/puppet/type/ssh_authorized_key.rb

@@ -31,6 +31,20 @@ module Puppet
 
         newproperty(:target) do
             desc "The file in which to store the SSH key."
+
+            defaultto :absent
+
+            def should
+                if defined? @should and @should[0] != :absent
+                    return super
+                end
+
+                if user = resource[:user]
+                    return File.expand_path("~%s/.ssh/authorized_keys" % user)
+                end
+
+                return nil
+            end
         end
 
         newproperty(:options, :array_matching => :all) do

data/lib/puppet/type/user.rb

@@ -100,6 +100,8 @@ module Puppet
             end
 
             def insync?(is)
+                return true unless self.should
+
                 # We know the 'is' is a number, so we need to convert the 'should' to a number,
                 # too.
                 @should.each do |value|
@@ -142,6 +144,10 @@ module Puppet
         newproperty(:password, :required_features => :manages_passwords) do
             desc "The user's password, in whatever encrypted format the local machine requires. Be sure to enclose any value that includes a dollar sign ($) in single quotes (\')."
 
+            validate do |value|
+                raise ArgumentError, "Passwords cannot include ':'" if value.is_a?(String) and value.include?(":")
+            end
+
             def change_to_s(currentvalue, newvalue)
                 if currentvalue == :absent
                   return "created password"

data/lib/puppet/type/yumrepo.rb

@@ -177,7 +177,10 @@ module Puppet
 
         # Store all modifications back to disk
         def self.store
-            inifile.store
+            file = inifile.store
+            unless file.nil?
+                File.chmod(0644, file)
+            end
         end
 
         def self.clear

data/lib/puppet/util/autoload.rb

@@ -78,7 +78,7 @@ class Puppet::Util::Autoload
                 name = symbolize(name)
                 loaded name, file
                 return true
-            rescue LoadError => detail
+            rescue Exception => detail
                 # I have no idea what's going on here, but different versions
                 # of ruby are raising different errors on missing files.
                 unless detail.to_s =~ /^no such file/i
@@ -115,7 +115,7 @@ class Puppet::Util::Autoload
                 begin
                     Kernel.require file
                     loaded(name, file)
-                rescue => detail
+                rescue Exception => detail
                     if Puppet[:trace]
                         puts detail.backtrace
                     end

data/lib/puppet/util/filetype.rb

@@ -72,11 +72,6 @@ class Puppet::Util::FileType
         @filetypes[type]
     end
 
-    # Back the file up before replacing it.
-    def backup
-        bucket.backup(@path) if FileTest.exists?(@path)
-    end
-
     # Pick or create a filebucket to use.
     def bucket
         filebucket = Puppet::Type.type(:filebucket)
@@ -90,9 +85,14 @@ class Puppet::Util::FileType
 
     # Operate on plain files.
     newfiletype(:flat) do
+        # Back the file up before replacing it.
+        def backup
+            bucket.backup(@path) if File.exists?(@path)
+        end
+
         # Read the file.
         def read
-            if File.exists?(@path)
+            if File.exist?(@path)
                 File.read(@path)
             else
                 return nil
@@ -101,14 +101,13 @@ class Puppet::Util::FileType
 
         # Remove the file.
         def remove
-            if File.exists?(@path)
+            if File.exist?(@path)
                 File.unlink(@path)
             end
         end
 
         # Overwrite the file.
         def write(text)
-            backup()
             require "tempfile"
             tf = Tempfile.new("puppet") 
             tf.print text; tf.flush 
@@ -250,92 +249,4 @@ class Puppet::Util::FileType
             output_file.delete
         end
     end
-
-    # Treat netinfo tables as a single file, just for simplicity of certain
-    # types
-    newfiletype(:netinfo) do
-        class << self
-            attr_accessor :format
-        end
-        def read
-            %x{nidump -r /#{@path} /}
-        end
-
-        # This really only makes sense for cron tabs.
-        def remove
-            %x{nireport / /#{@path} name}.split("\n").each do |name|
-                newname = name.gsub(/\//, '\/').sub(/\s+$/, '')
-                output = %x{niutil -destroy / '/#{@path}/#{newname}'}
-
-                unless $? == 0
-                    raise Puppet::Error, "Could not remove %s from %s" %
-                        [name, @path]
-                end
-            end
-        end
-
-        # Convert our table to an array of hashes.  This only works for
-        # handling one table at a time.
-        def to_array(text = nil)
-            unless text
-                text = read
-            end
-
-            hash = nil
-
-            # Initialize it with the first record
-            records = []
-            text.split("\n").each do |line|
-                next if line =~ /^[{}]$/ # Skip the wrapping lines
-                next if line =~ /"name" = \( "#{@path}" \)/ # Skip the table name
-                next if line =~ /CHILDREN = \(/ # Skip this header
-                next if line =~ /^  \)/ # and its closer
-
-                # Now we should have nothing but records, wrapped in braces
-
-                case line
-                when /^\s+\{/: hash = {}
-                when /^\s+\}/: records << hash
-                when /\s+"(\w+)" = \( (.+) \)/
-                    field = $1
-                    values = $2
-
-                    # Always use an array
-                    hash[field] = []
-
-                    values.split(/, /).each do |value|
-                        if value =~ /^"(.*)"$/
-                            hash[field] << $1
-                        else
-                            raise ArgumentError, "Could not match value %s" % value
-                        end
-                    end
-                else    
-                    raise ArgumentError, "Could not match line %s" % line
-                end
-            end
-
-            records
-        end
-
-        def write(text)
-            text.gsub!(/^#.*\n/,'')
-            text.gsub!(/^$/,'')
-            if text == "" or text == "\n"
-                self.remove
-                return
-            end
-            unless format = self.class.format
-                raise Puppe::DevError, "You must define the NetInfo format to inport"
-            end
-            IO.popen("niload -d #{format} . 1>/dev/null 2>/dev/null", "w") { |p|
-                p.print text
-            }
-
-            unless $? == 0
-                raise ArgumentError, "Failed to write %s" % @path
-            end
-        end
-    end
 end
-