puppet 0.24.1 → 0.24.2

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

@@ -8,6 +8,10 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
 
     defaultfor :operatingsystem => :gentoo
 
+    def self.defpath
+        superclass.defpath
+    end
+
     def disable
         begin
             output = update :del, @resource[:name], :default

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

@@ -110,7 +110,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # we just return that; otherwise, we return false, which causes it to
     # fallback to other mechanisms.
     def statuscmd
-        if @resource[:hasstatus]
+        if @resource[:hasstatus] == :true
             return [self.initscript, :status]
         else
             return false

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

@@ -12,6 +12,8 @@ Puppet::Type.type(:sshkey).provide(:parsed,
     :default_target => known,
     :filetype => :flat
 ) do
+    desc "Parse and generate host-wide known hosts files for SSH."
+
     text_line :comment, :match => /^#/
     text_line :blank, :match => /^\s+/
 

data/lib/puppet/provider/user/useradd.rb

@@ -19,7 +19,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
     has_features :manages_homedir, :allows_duplicates
 
-    if Puppet.features.libshadow? and (Facter.value(:kernel) == "Linux")
+    if Puppet.features.libshadow?
         has_feature :manages_passwords
     end
 

data/lib/puppet/rails.rb

@@ -91,6 +91,10 @@ module Puppet::Rails
             raise Puppet::Error, "Could not find Puppet::Rails database dir"
         end
 
+        unless ActiveRecord::Base.connection.tables.include?("resources")
+            raise Puppet::Error, "Database has problems, can't migrate."
+        end    
+
         Puppet.notice "Migrating"
 
         begin

data/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb

@@ -0,0 +1,17 @@
+class AddCreatedAtToAllTables < ActiveRecord::Migration
+  def self.up
+    ActiveRecord::Base.connection.tables.each do |t|
+      unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
+        add_column t.to_s, :created_at, :datetime 
+      end  
+    end 
+  end
+
+  def self.down
+    ActiveRecord::Base.connection.tables.each do |t|
+      unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at")
+        remove_column t.to_s, :created_at
+      end  
+    end  
+  end
+end

data/lib/puppet/rails/fact_value.rb

@@ -1,6 +1,10 @@
 class Puppet::Rails::FactValue < ActiveRecord::Base
     belongs_to :fact_name
     belongs_to :host
+
+    def to_label
+      "#{self.fact_name.name}"
+    end  
 end
 
 # $Id: fact_value.rb 1952 2006-12-19 05:47:57Z luke $

data/lib/puppet/rails/host.rb

@@ -11,8 +11,7 @@ class Puppet::Rails::Host < ActiveRecord::Base
 
     has_many :fact_values, :dependent => :destroy
     has_many :fact_names, :through => :fact_values
-    belongs_to :puppet_classes
-    has_many :source_files
+    belongs_to :source_file
     has_many :resources,
         :include => :param_values,
         :dependent => :destroy

data/lib/puppet/rails/param_value.rb

@@ -20,5 +20,9 @@ class Puppet::Rails::ParamValue < ActiveRecord::Base
             self[:value] = val
         end
     end
+
+    def to_label
+      "#{self.param_name.name}"
+    end  
 end
 

data/lib/puppet/rails/resource_tag.rb

@@ -1,4 +1,8 @@
 class Puppet::Rails::ResourceTag < ActiveRecord::Base
     belongs_to :puppet_tag
     belongs_to :resource
+
+    def to_label
+      "#{self.puppet_tag.name}"
+    end  
 end

data/lib/puppet/rails/source_file.rb

@@ -1,5 +1,8 @@
 class Puppet::Rails::SourceFile < ActiveRecord::Base
     has_one :host
-    has_one :puppet_class
     has_one :resource
+
+    def to_label
+      "#{self.filename}"
+    end  
 end

data/lib/puppet/relationship.rb

@@ -59,7 +59,11 @@ class Puppet::Relationship
     end
     
     def ref
-        "%s => %s" % [source.ref, target.ref]
+        "%s => %s" % [source, target]
+    end
+
+    def to_s
+        ref
     end
 end
 

data/lib/puppet/reports/tagmail.rb

@@ -28,6 +28,10 @@ Puppet::Reports.register_report(:tagmail) do
 
         This will send all messages to ``me@domain.com``, and all messages from
         webservers that are not also from mailservers to ``httpadmins@domain.com``.
+
+        If you are using anti-spam controls, such as grey-listing, on your mail 
+        server you should whitelist the sending email (controlled by ``reportform`` 
+        configuration option) to ensure your email is not discarded as spam.  
         "
 
 
@@ -127,7 +131,14 @@ Puppet::Reports.register_report(:tagmail) do
                     Net::SMTP.start(Puppet[:smtpserver]) do |smtp|
                         reports.each do |emails, messages|
                             Puppet.info "Sending report to %s" % emails.join(", ")
-                            smtp.send_message(messages, Puppet[:reportfrom], *emails)
+                            smtp.open_message_stream(Puppet[:reportfrom], *emails) do |p|
+                              p.puts "From: #{Puppet[:reportfrom]}"
+                              p.puts "Subject: Puppet Report for %s" % self.host
+                              p.puts "To: " + emails.join(", ")
+                              p.puts "Date: " + Time.now.rfc2822
+                              p.puts
+                              p.puts messages
+                            end 
                         end
                     end
                 rescue => detail

data/lib/puppet/resource_reference.rb

@@ -36,7 +36,7 @@ class Puppet::ResourceReference
     # If the title has square brackets, treat it like a reference and
     # set things appropriately; else, just set it.
     def title=(value)
-        if value =~ /^(.+)\[(.+)\]$/
+        if value =~ /^([^\[\]]+)\[(.+)\]$/
             self.type = $1
             @title = $2
         else

data/lib/puppet/simple_graph.rb

@@ -1,14 +1,11 @@
 #  Created by Luke A. Kanies on 2007-11-07.
 #  Copyright (c) 2007. All rights reserved.
 
-require 'puppet/external/gratr/dot'
+require 'puppet/external/dot'
 require 'puppet/relationship'
-require 'puppet/external/gratr/search'
 
 # A hopefully-faster graph class to replace the use of GRATR.
 class Puppet::SimpleGraph
-    include GRATR::Graph::Search
-
     # An internal class for handling a vertex's edges.
     class VertexWrapper
         attr_accessor :in, :out, :vertex
@@ -52,6 +49,19 @@ class Puppet::SimpleGraph
             return false
         end
 
+        # Create methods for returning the degree and edges.
+        [:in, :out].each do |direction|
+            # LAK:NOTE If you decide to create methods for directly
+            # testing the degree, you'll have to get the values and flatten
+            # the results -- you might have duplicate edges, which can give
+            # a false impression of what the degree is.  That's just
+            # as expensive as just getting the edge list, so I've decided
+            # to only add this method.
+            define_method("%s_edges" % direction) do
+                @adjacencies[direction].values.flatten
+            end
+        end
+
         # The other vertex in the edge.
         def other_vertex(direction, edge)
             case direction
@@ -66,6 +76,10 @@ class Puppet::SimpleGraph
         def remove_edge(direction, edge)
             @adjacencies[direction][other_vertex(direction, edge)].delete(edge)
         end
+
+        def to_s
+            vertex.to_s
+        end
     end
 
     def initialize
@@ -80,7 +94,7 @@ class Puppet::SimpleGraph
         @edges.clear
     end
 
-    # Whether our graph is directed.  Always true.  (Used by the GRATR search lib.)
+    # Whether our graph is directed.  Always true.  Used to produce dot files.
     def directed?
         true
     end
@@ -88,26 +102,58 @@ class Puppet::SimpleGraph
     # Return a reversed version of this graph.
     def reversal
         result = self.class.new
-        vertices.each { |vertex| result.add_vertex!(vertex) }
+        vertices.each { |vertex| result.add_vertex(vertex) }
         edges.each do |edge|
             newedge = edge.class.new(edge.target, edge.source, edge.label)
-            result.add_edge!(newedge)
+            result.add_edge(newedge)
         end
         result
     end
 
-    # Return the size of the graph. Used by GRATR.
+    # Return the size of the graph.
     def size
         @vertices.length
     end
 
-    # Return the graph as an array.  Again, used by GRATR.
+    # Return the graph as an array.
     def to_a
         @vertices.keys
     end
 
+    # Provide a topological sort.
+    def topsort
+        degree = {}
+        zeros = []
+        result = []
+
+        # Collect each of our vertices, with the number of in-edges each has.
+        @vertices.each do |name, wrapper|
+            edges = wrapper.in_edges
+            zeros << wrapper if edges.length == 0
+            degree[wrapper.vertex] = edges
+        end
+
+        # Iterate over each 0-degree vertex, decrementing the degree of
+        # each of its out-edges.
+        while wrapper = zeros.pop do
+            result << wrapper.vertex
+            wrapper.out_edges.each do |edge|
+                degree[edge.target].delete(edge)
+                zeros << @vertices[edge.target] if degree[edge.target].length == 0
+            end
+        end
+
+        # If we have any vertices left with non-zero in-degrees, then we've found a cycle.
+        if cycles = degree.find_all { |vertex, edges| edges.length > 0 } and cycles.length > 0
+            message = cycles.collect { |vertex, edges| edges.collect { |e| e.to_s }.join(", ") }.join(", ")
+            raise Puppet::Error, "Found dependency cycles in the following relationships: %s" % message
+        end
+
+        return result
+    end
+
     # Add a new vertex to the graph.
-    def add_vertex!(vertex)
+    def add_vertex(vertex)
         return false if vertex?(vertex)
         setup_vertex(vertex)
         true # don't return the VertexWrapper instance.
@@ -133,7 +179,7 @@ class Puppet::SimpleGraph
 
     # Add a new edge.  The graph user has to create the edge instance,
     # since they have to specify what kind of edge it is.
-    def add_edge!(source, target = nil, label = nil)
+    def add_edge(source, target = nil, label = nil)
         if target
             edge = Puppet::Relationship.new(source, target, label)
         else
@@ -195,6 +241,27 @@ class Puppet::SimpleGraph
     end
  
     public
+    
+#    # For some reason, unconnected vertices do not show up in
+#    # this graph.
+#    def to_jpg(path, name)
+#        gv = vertices()
+#        Dir.chdir(path) do
+#            induced_subgraph(gv).write_to_graphic_file('jpg', name)
+#        end
+#    end
+
+    def to_yaml_properties
+        instance_variables
+    end
+
+    # Just walk the tree and pass each edge.
+    def walk(source, direction, &block)
+        adjacent(source, :direction => direction).each do |target|
+            yield source, target
+            walk(target, direction, &block)
+        end
+    end
 
     # LAK:FIXME This is just a paste of the GRATR code with slight modifications.
 

data/lib/puppet/sslcertificates.rb

@@ -72,7 +72,7 @@ module Puppet::SSLCertificates
                 subject_alt_name << 'DNS:' + name.sub(/^[^.]+./, "puppet.") # add puppet.domain as an alias
             end
             key_usage = %w{digitalSignature keyEncipherment}
-            ext_key_usage = %w{serverAuth clientAuth}
+            ext_key_usage = %w{serverAuth clientAuth emailProtection}
         when :ocsp:
             basic_constraint = "CA:FALSE"
             key_usage = %w{nonRepudiation digitalSignature}

data/lib/puppet/sslcertificates/ca.rb

@@ -194,8 +194,8 @@ class Puppet::SSLCertificates::CA
     # Revoke the certificate with serial number SERIAL issued by this
     # CA. The REASON must be one of the OpenSSL::OCSP::REVOKED_* reasons
     def revoke(serial, reason = OpenSSL::OCSP::REVOKED_STATUS_KEYCOMPROMISE)
-        if @config[:cacrl] == 'none'
-            raise Puppet::Error, "Revocation requires a CRL, but ca_crl is set to 'none'"
+        if @config[:cacrl] == 'false'
+            raise Puppet::Error, "Revocation requires a CRL, but ca_crl is set to 'false'"
         end
         time = Time.now
         revoked = OpenSSL::X509::Revoked.new
@@ -372,7 +372,7 @@ class Puppet::SSLCertificates::CA
             @crl = OpenSSL::X509::CRL.new(
                 File.read(@config[:cacrl])
             )
-        elsif @config[:cacrl] == 'none'
+        elsif @config[:cacrl] == 'false'
             @crl = nil
         else
             # Create new CRL

data/lib/puppet/transaction.rb

@@ -15,8 +15,6 @@ class Transaction
     # The list of events generated in this transaction.
     attr_reader :events
     
-    attr_writer :tags
-
     include Puppet::Util
 
     # Add some additional times for reporting
@@ -173,7 +171,7 @@ class Transaction
             relationship_graph.add_resource(gen_child) unless relationship_graph.resource(gen_child.ref)
 
             unless relationship_graph.edge?(edge[1], edge[0])
-                relationship_graph.add_edge!(*edge)
+                relationship_graph.add_edge(*edge)
             else
                 resource.debug "Skipping automatic relationship to %s" % gen_child
             end
@@ -424,7 +422,7 @@ class Transaction
 
     # Should we ignore tags?
     def ignore_tags?
-        ! @catalog.host_config?
+        ! (@catalog.host_config? or Puppet[:name] == "puppet")
     end
 
     # this should only be called by a Puppet::Type::Component resource now
@@ -636,6 +634,11 @@ class Transaction
         
         @tags
     end
+
+    def tags=(tags)
+        tags = [tags] unless tags.is_a?(Array)
+        @tags = tags
+    end
     
     # Is this resource tagged appropriately?
     def missing_tags?(resource)

data/lib/puppet/transportable.rb

@@ -193,7 +193,7 @@ module Puppet
                             next unless resource = child.to_type
                             config.add_resource resource
                         end
-                        config.add_edge!(container, resource)
+                        config.add_edge(container, resource)
                         if child.is_a?(self.class)
                             delver.call(child)
                         end

data/lib/puppet/type.rb

@@ -257,10 +257,7 @@ class Type
                 rescue ArgumentError, Puppet::Error, TypeError
                     raise
                 rescue => detail
-                    error = Puppet::DevError.new(
-                        "Could not set %s on %s: %s" %
-                            [attr, self.class.name, detail]
-                    )
+                    error = Puppet::DevError.new( "Could not set %s on %s: %s" % [attr, self.class.name, detail])
                     error.set_backtrace(detail.backtrace)
                     raise error
                 end
@@ -422,10 +419,6 @@ end
 
 require 'puppet/propertychange'
 require 'puppet/provider'
-require 'puppet/type/component'
-require 'puppet/type/pfile'
-require 'puppet/type/pfilebucket'
-require 'puppet/type/tidy'
-
-
 
+# Always load these types.
+require 'puppet/type/component'

data/lib/puppet/type/cron.rb

@@ -23,6 +23,24 @@ Puppet::Type.newtype(:cron) do
                 hour => 2,
                 minute => 0
             }
+
+        Note that all cron values can be specified as an array of values::
+
+            cron { logrotate:
+                command => \"/usr/sbin/logrotate\",
+                user => root,
+                hour => [2, 4]
+            }
+
+        Or using ranges, or the step syntax ``*/2`` (although there's no guarantee that
+        your ``cron`` daemon supports it)::
+
+            cron { logrotate:
+                command => \"/usr/sbin/logrotate\",
+                user => root,
+                hour => ['2-4'],
+                minute => '*/10'
+            }
         "
     ensurable