puppet 0.23.2 → 0.24.0

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

@@ -12,7 +12,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
     case Facter["operatingsystem"].value
     when "FreeBSD":
-        @defpath = "/etc/rc.d"
+        @defpath = ["/etc/rc.d", "/usr/local/etc/rc.d"]
     else
         @defpath = "/etc/init.d"
     end
@@ -20,48 +20,25 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # We can't confine this here, because the init path can be overridden.
     #confine :exists => @defpath
 
-    if self.suitable?
-        # Add it to the search paths
-        Puppet.type(:service).newpath(:init, defpath())
-
-        # Set the default init directory.
-        Puppet.type(:service).attrclass(:path).defaultto defpath()
-    end
-
     # List all services of this type.
-    def self.instances(name)
-        # We need to find all paths specified for our type or any parent types
-        paths = Puppet.type(:service).paths(name)
-
-        # Now see if there are any included modules
-        included_modules.each do |mod|
-            next unless mod.respond_to? :name
-
-            mname = mod.name
-
-            if mpaths = Puppet.type(:service).paths(mname) and ! mpaths.empty?
-                 paths += mpaths
-            end
+    def self.instances
+        path = self.defpath
+        unless FileTest.directory?(path)
+            Puppet.notice "Service path %s does not exist" % path
+            next
         end
 
-        paths.collect do |path|
-            unless FileTest.directory?(path)
-                Puppet.notice "Service path %s does not exist" % path
-                next
-            end
+        check = [:ensure]
 
-            check = [:ensure]
-
-            if public_method_defined? :enabled?
-                check << :enable
-            end
+        if public_method_defined? :enabled?
+            check << :enable
+        end
 
-            Dir.entries(path).reject { |e|
-                fullpath = File.join(path, e)
-                e =~ /^\./ or ! FileTest.executable?(fullpath)
-            }.collect do |name|
-                new(:name => name, :path => path)
-            end
+        Dir.entries(path).reject { |e|
+            fullpath = File.join(path, e)
+            e =~ /^\./ or ! FileTest.executable?(fullpath)
+        }.collect do |name|
+            new(:name => name, :path => path)
         end
     end
 
@@ -108,7 +85,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
             # if we've gotten this far, we found a valid script
             return fqname
         }
-        @model[:path].each { |path|
+        @resource[:path].each { |path|
             fqname_sh = File.join(path,"#{name}.sh")
             begin
                 stat = File.stat(fqname_sh)
@@ -146,4 +123,3 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     end
 end
 
-# $Id: init.rb 2619 2007-06-18 21:26:04Z luke $

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

@@ -6,16 +6,12 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
 
     commands :chkconfig => "/sbin/chkconfig"
 
-    defaultfor :operatingsystem => [:redhat, :fedora, :suse]
+    defaultfor :operatingsystem => [:redhat, :fedora, :suse, :centos]
 
     def self.defpath
         superclass.defpath
     end
 
-    if self.suitable?
-        Puppet.type(:service).newpath(:redhat, defpath())
-    end
-
     # Remove the symlinks
     def disable
         begin
@@ -56,4 +52,3 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
     end
 end
 
-# $Id: redhat.rb 2501 2007-05-09 23:08:42Z luke $

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

@@ -82,4 +82,3 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     end
 end
 
-# $Id: smf.rb 2501 2007-05-09 23:08:42Z luke $

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

@@ -33,4 +33,3 @@ Puppet::Type.type(:sshkey).provide(:parsed,
         }
 end
 
-# $Id: parsed.rb 2281 2007-03-14 17:49:19Z luke $

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

@@ -103,4 +103,3 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ
     end
 end
 
-# $Id: netinfo.rb 2542 2007-05-30 20:36:29Z mpalmer $

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

@@ -43,4 +43,3 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     end
 end
 
-# $Id: pw.rb 2600 2007-06-18 06:42:07Z luke $

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

@@ -59,4 +59,3 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     end
 end
 
-# $Id: useradd.rb 2542 2007-05-30 20:36:29Z mpalmer $

data/lib/puppet/provider/zone/solaris.rb

@@ -240,4 +240,3 @@ set zonepath=%s
     end
 end
 
-# $Id: solaris.rb 2577 2007-06-14 03:39:23Z luke $

data/lib/puppet/rails.rb

@@ -8,45 +8,51 @@ module Puppet::Rails
     def self.connect
         # This global init does not work for testing, because we remove
         # the state dir on every test.
-        unless ActiveRecord::Base.connected?
-            Puppet.config.use(:main, :rails, :puppetmasterd)
-
-            ActiveRecord::Base.logger = Logger.new(Puppet[:railslog])
-            begin
-                loglevel = Logger.const_get(Puppet[:rails_loglevel].upcase)
-                ActiveRecord::Base.logger.level = loglevel
-            rescue => detail
-                Puppet.warning "'%s' is not a valid Rails log level; using debug" % Puppet[:rails_loglevel]
-                ActiveRecord::Base.logger.level = Logger::DEBUG
-            end
-            ActiveRecord::Base.allow_concurrency = true
-            ActiveRecord::Base.verify_active_connections!
-
-            begin
-                ActiveRecord::Base.establish_connection(database_arguments())
-            rescue => detail
-                if Puppet[:trace]
-                    puts detail.backtrace
-                end
-                raise Puppet::Error, "Could not connect to database: %s" % detail
-            end 
+        return if ActiveRecord::Base.connected?
+
+        Puppet.settings.use(:main, :rails, :puppetmasterd)
+
+        ActiveRecord::Base.logger = Logger.new(Puppet[:railslog])
+        begin
+            loglevel = Logger.const_get(Puppet[:rails_loglevel].upcase)
+            ActiveRecord::Base.logger.level = loglevel
+        rescue => detail
+            Puppet.warning "'%s' is not a valid Rails log level; using debug" % Puppet[:rails_loglevel]
+            ActiveRecord::Base.logger.level = Logger::DEBUG
         end
+
+        ActiveRecord::Base.allow_concurrency = true
+        ActiveRecord::Base.verify_active_connections!
+
+        begin
+            ActiveRecord::Base.establish_connection(database_arguments())
+        rescue => detail
+            if Puppet[:trace]
+                puts detail.backtrace
+            end
+            raise Puppet::Error, "Could not connect to database: %s" % detail
+        end 
     end
 
     # The arguments for initializing the database connection.
     def self.database_arguments
-        args = {:adapter => Puppet[:dbadapter], :log_level => Puppet[:rails_loglevel]}
+        adapter = Puppet[:dbadapter]
+        
+        args = {:adapter => adapter, :log_level => Puppet[:rails_loglevel]}
 
-        case Puppet[:dbadapter]
+        case adapter
         when "sqlite3":
             args[:dbfile] = Puppet[:dblocation]
         when "mysql", "postgresql":
-            args[:host]     = Puppet[:dbserver]
-            args[:username] = Puppet[:dbuser]
-            args[:password] = Puppet[:dbpassword]
+            args[:host]     = Puppet[:dbserver] unless Puppet[:dbserver].empty?
+            args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty?
+            args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].empty?
             args[:database] = Puppet[:dbname]
+            
+            socket          = Puppet[:dbsocket]
+            args[:socket]   = socket unless socket.empty?
         else
-            raise ArgumentError, "Invalid db adapter %s" % Puppet[:dbadapter]
+            raise ArgumentError, "Invalid db adapter %s" % adapter
         end
         args
     end
@@ -103,7 +109,7 @@ module Puppet::Rails
             raise Puppet::DevError, "No activerecord, cannot init Puppet::Rails"
         end
 
-        Puppet.config.use(:puppetmasterd, :rails)
+        Puppet.settings.use(:puppetmasterd, :rails)
 
         begin
             ActiveRecord::Base.establish_connection(database_arguments())
@@ -124,4 +130,3 @@ if Puppet.features.rails?
     require 'puppet/rails/host'
 end
 
-# $Id: rails.rb 2667 2007-07-09 23:15:01Z luke $

data/lib/puppet/rails/database/schema.rb

@@ -107,4 +107,3 @@ class Puppet::Rails::Schema
     end
 end
 
-# $Id: schema.rb 2590 2007-06-15 19:30:20Z luke $

data/lib/puppet/rails/host.rb

@@ -28,35 +28,27 @@ class Puppet::Rails::Host < ActiveRecord::Base
     end
 
     # Store our host in the database.
-    def self.store(hash)
-        unless name = hash[:name]
-            raise ArgumentError, "You must specify the hostname for storage"
-        end
-
+    def self.store(node, resources)
         args = {}
 
         host = nil
         transaction do
             #unless host = find_by_name(name)
             seconds = Benchmark.realtime {
-                unless host = find_by_name(name)
-                    host = new(:name => name)
+                unless host = find_by_name(node.name)
+                    host = new(:name => node.name)
                 end
             }
             Puppet.notice("Searched for host in %0.2f seconds" % seconds) if defined?(Puppet::TIME_DEBUG)
-            if ip = hash[:facts]["ipaddress"]
+            if ip = node.parameters["ipaddress"]
                 host.ip = ip
             end
 
             # Store the facts into the database.
-            host.setfacts(hash[:facts])
-
-            unless hash[:resources]
-                raise ArgumentError, "You must pass resources"
-            end
+            host.setfacts node.parameters
 
             seconds = Benchmark.realtime {
-                host.setresources(hash[:resources])
+                host.setresources(resources)
             }
             Puppet.notice("Handled resources in %0.2f seconds" % seconds) if defined?(Puppet::TIME_DEBUG)
 
@@ -158,4 +150,3 @@ class Puppet::Rails::Host < ActiveRecord::Base
     end
 end
 
-# $Id: host.rb 2735 2007-08-03 19:31:15Z lutter $

data/lib/puppet/rails/param_name.rb

@@ -9,7 +9,7 @@ class Puppet::Rails::ParamName < ActiveRecord::Base
         hash = {}
         hash[:name] = self.name.to_sym
         hash[:source] = source
-        hash[:value] = resource.param_values.find(:all, :conditions => [ "param_name_id = ?", self]).collect { |v| v.value }
+        hash[:value] = resource.param_values.find(:all, :conditions => [ "param_name_id = ?", self.id]).collect { |v| v.value }
         if hash[:value].length == 1
             hash[:value] = hash[:value].shift
         elsif hash[:value].empty?
@@ -19,4 +19,3 @@ class Puppet::Rails::ParamName < ActiveRecord::Base
     end
 end
 
-# $Id: param_name.rb 2706 2007-07-18 19:47:09Z luke $

data/lib/puppet/rails/param_value.rb

@@ -22,4 +22,3 @@ class Puppet::Rails::ParamValue < ActiveRecord::Base
     end
 end
 
-# $Id: param_value.rb 2706 2007-07-18 19:47:09Z luke $

data/lib/puppet/rails/puppet_class.rb

@@ -4,4 +4,3 @@ class Puppet::Rails::PuppetClass < ActiveRecord::Base
     has_many :hosts
 end
 
-# $Id$

data/lib/puppet/rails/resource.rb

@@ -104,16 +104,16 @@ class Puppet::Rails::Resource < ActiveRecord::Base
         end
         hash[:scope] = scope
         hash[:source] = scope.source
-        obj = Puppet::Parser::Resource.new(hash)
-
+        hash[:params] = []
         names = []
         self.param_names.each do |pname|
             # We can get the same name multiple times because of how the
             # db layout works.
             next if names.include?(pname.name)
             names << pname.name
-            obj.set(pname.to_resourceparam(self, scope.source))
+            hash[:params] << pname.to_resourceparam(self, scope.source)
         end
+        obj = Puppet::Parser::Resource.new(hash)
 
         # Store the ID, so we can check if we're re-collecting the same resource.
         obj.rails_id = self.id
@@ -121,5 +121,3 @@ class Puppet::Rails::Resource < ActiveRecord::Base
         return obj
     end
 end
-
-# $Id: resource.rb 2705 2007-07-18 17:32:46Z luke $

data/lib/puppet/reference/configuration.rb

@@ -1,6 +1,6 @@
 config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc => "A reference for all configuration parameters") do
     docs = {}
-    Puppet.config.each do |name, object|
+    Puppet.settings.each do |name, object|
         docs[name] = object
     end
 
@@ -29,7 +29,9 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
         elsif name.to_s == "confdir"
             val = "/etc/puppet"
         end
-        str += "- **Section**: %s\n" % object.section
+
+        # Leave out the section information; it was apparently confusing people.
+        #str += "- **Section**: %s\n" % object.section
         unless val == ""
             str += "- **Default**: %s\n" % val
         end
@@ -73,10 +75,14 @@ the client configuration.
 
 Configuration Files
 +++++++++++++++++++
-As mentioned above, the configuration parameters can also be stored in a 
-configuration file, located in the configuration directory (`/etc/puppet` 
-by default).  As of 0.23.0, all executables look for ``puppet.conf`` in their
-configuration directory (although they previously looked for separate files).
+As mentioned above, the configuration parameters can also be stored in a
+configuration file, located in the configuration directory.  As root, the
+default configuration directory is ``/etc/puppet``, and as a regular user, the
+default configuration directory is ``~user/.puppet``.  As of 0.23.0, all
+executables look for ``puppet.conf`` in their configuration directory
+(although they previously looked for separate files).  For example,
+``puppet.conf`` is located at ``/etc/puppet/puppet.conf`` as root and
+``~user/.puppet/puppet.conf`` as a regular user by default.
 
 All executables will set any parameters set within the ``main`` section,
 while each executable will also look for a section named for the executable

data/lib/puppet/reference/indirection.rb

@@ -0,0 +1,34 @@
+require 'puppet/indirector/indirection'
+require 'puppet/checksum'
+require 'puppet/file_serving/content'
+require 'puppet/file_serving/metadata'
+
+reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirection types and their terminus classes" do
+    text = ""
+    Puppet::Indirector::Indirection.instances.sort { |a,b| a.to_s <=> b.to_s }.each do |indirection|
+        ind = Puppet::Indirector::Indirection.instance(indirection)
+        name = indirection.to_s.capitalize
+        text += indirection.to_s + "\n" + ("-" * name.length) + "\n\n"
+
+        text += ind.doc + "\n\n"
+
+        Puppet::Indirector::Terminus.terminus_classes(ind.name).sort { |a,b| a.to_s <=> b.to_s }.each do |terminus|
+            text += terminus.to_s + "\n" + ("+" * terminus.to_s.length) + "\n\n"
+
+            term_class = Puppet::Indirector::Terminus.terminus_class(ind.name, terminus)
+
+            text += Puppet::Util::Docs.scrub(term_class.doc) + "\n\n"
+        end
+    end
+
+    text
+end
+
+reference.header = "This is the list of all indirections, their associated terminus classes, and how you select between them.
+
+In general, the appropriate terminus class is selected by the application for you (e.g., ``puppetd`` would always use the ``rest``
+terminus for most of its indirected classes), but some classes are tunable via normal settings.  These will have ``terminus setting``
+documentation listed with them.
+
+
+"

data/lib/puppet/reference/node_source.rb

@@ -0,0 +1,9 @@
+require 'puppet/node'
+
+noderef = Puppet::Util::Reference.newreference :node_source, :doc => "Sources of node configuration information" do
+    Puppet::Network::Handler.node.docs
+end
+
+noderef.header = "
+Nodes can be searched for in different locations.  This document describes those different locations.
+"

data/lib/puppet/relationship.rb

@@ -3,12 +3,15 @@
 #  Created by Luke A. Kanies on 2006-11-24.
 #  Copyright (c) 2006. All rights reserved.
 
-require 'puppet/external/gratr'
-
 # subscriptions are permanent associations determining how different
 # objects react to an event
 
-class Puppet::Relationship < GRATR::Edge
+# This is Puppet's class for modeling edges in its configuration graph.
+# It used to be a subclass of GRATR::Edge, but that class has weird hash
+# overrides that dramatically slow down the graphing.
+class Puppet::Relationship
+    attr_accessor :source, :target, :label
+
     # Return the callback
     def callback
         if label
@@ -30,17 +33,17 @@ class Puppet::Relationship < GRATR::Edge
     def initialize(source, target, label = {})
         if label
             unless label.is_a?(Hash)
-                raise Puppet::DevError, "The label must be a hash"
+                raise ArgumentError, "Relationship labels must be a hash"
             end
         
             if label[:event] and label[:event] != :NONE and ! label[:callback]
-                raise Puppet::DevError, "You must pass a callback for non-NONE events"
+                raise ArgumentError, "You must pass a callback for non-NONE events"
             end
         else
             label = {}
         end
-        
-        super(source, target, label)
+
+        @source, @target, @label = source, target, label
     end
     
     # Does the passed event match our event?  This is where the meaning
@@ -60,4 +63,3 @@ class Puppet::Relationship < GRATR::Edge
     end
 end
 
-# $Id: relationship.rb 2119 2007-01-30 05:27:56Z luke $