puppet 0.24.9 → 0.25.0

data/lib/puppet/configurer/plugin_handler.rb

@@ -0,0 +1,26 @@
+# Break out the code related to plugins.  This module is
+# just included into the agent, but having it here makes it
+# easier to test.
+module Puppet::Configurer::PluginHandler
+    def download_plugins?
+        Puppet[:pluginsync]
+    end
+
+    # Retrieve facts from the central server.
+    def download_plugins
+        return nil unless download_plugins?
+        Puppet::Configurer::Downloader.new("plugin", Puppet[:plugindest], Puppet[:pluginsource], Puppet[:pluginsignore]).evaluate.each { |file| load_plugin(file) }
+    end
+
+    def load_plugin(file)
+        return unless FileTest.exist?(file)
+        return if FileTest.directory?(file)
+
+        begin
+            Puppet.info "Loading downloaded plugin %s" % file
+            load file
+        rescue Exception => detail
+            Puppet.err "Could not load downloaded file %s: %s" % [file, detail]
+        end
+    end
+end

data/lib/puppet/daemon.rb

@@ -1,10 +1,11 @@
 require 'puppet'
 require 'puppet/util/pidlock'
+require 'puppet/external/event-loop'
 
 # A module that handles operations common to all daemons.  This is included
 # into the Server and Client base classes.
-module Puppet::Daemon
-    include Puppet::Util
+class Puppet::Daemon
+    attr_accessor :agent, :server, :argv
 
     def daemonname
         Puppet[:name]
@@ -16,8 +17,8 @@ module Puppet::Daemon
             Process.detach(pid)
             exit(0)
         end
-        
-        setpidfile()
+
+        create_pidfile()
 
         # Get rid of console logging
         Puppet::Util::Log.close(:console)
@@ -30,7 +31,7 @@ module Puppet::Daemon
             $stderr.reopen $stdout
             Puppet::Util::Log.reopen
         rescue => detail
-            Puppet::Util.secure_open("/tmp/daemonout", "w") { |f|
+            File.open("/tmp/daemonout", "w") { |f|
                 f.puts "Could not start %s: %s" % [Puppet[:name], detail]
             }
             Puppet.err "Could not start %s: %s" % [Puppet[:name], detail]
@@ -38,18 +39,42 @@ module Puppet::Daemon
         end
     end
 
-    # The path to the pid file for this server
+    # Create a pidfile for our daemon, so we can be stopped and others
+    # don't try to start.
+    def create_pidfile
+        Puppet::Util.sync(Puppet[:name]).synchronize(Sync::EX) do
+            unless Puppet::Util::Pidlock.new(pidfile).lock
+                raise "Could not create PID file: %s" % [pidfile]
+            end
+        end
+    end
+
+    # Provide the path to our pidfile.
     def pidfile
-        if Puppet[:pidfile] != ""
-            Puppet[:pidfile]
-        else
-            File.join(Puppet[:rundir], daemonname() + ".pid")
+        Puppet[:pidfile]
+    end
+
+    def reexec
+        raise Puppet::DevError, "Cannot reexec unless ARGV arguments are set" unless argv
+        command = $0 + " " + argv.join(" ")
+        Puppet.notice "Restarting with '%s'" % command
+        stop(:exit => false)
+        exec(command)
+    end
+
+    def reload
+        return unless agent
+        if agent.running?
+            Puppet.notice "Not triggering already-running agent"
+            return
         end
+
+        agent.run
     end
 
-    # Remove the pid file
-    def rmpidfile
-        threadlock(:pidfile) do
+    # Remove the pid file for our daemon.
+    def remove_pidfile
+        Puppet::Util.sync(Puppet[:name]).synchronize(Sync::EX) do
             locker = Puppet::Util::Pidlock.new(pidfile)
             if locker.locked?
                 locker.unlock or Puppet.err "Could not remove PID file %s" % [pidfile]
@@ -57,27 +82,52 @@ module Puppet::Daemon
         end
     end
 
-    # Create the pid file.
-    def setpidfile
-        threadlock(:pidfile) do
-            unless Puppet::Util::Pidlock.new(pidfile).lock
-                Puppet.err("Could not create PID file: %s" % [pidfile])
-                exit(74)
-            end
+    def restart
+        if agent and agent.running?
+            agent.configure_delayed_restart
+        else
+            reexec
         end
     end
 
-    # Shut down our server
-    def shutdown
-        # Remove our pid file
-        rmpidfile()
+    def reopen_logs
+        Puppet::Util::Log.reopen
+    end
 
-        # And close all logs except the console.
-        Puppet::Util::Log.destinations.reject { |d| d == :console }.each do |dest|
-            Puppet::Util::Log.close(dest)
+    # Trap a couple of the main signals.  This should probably be handled
+    # in a way that anyone else can register callbacks for traps, but, eh.
+    def set_signal_traps
+        {:INT => :stop, :TERM => :stop, :HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs}.each do |signal, method|
+            trap(signal) do
+                Puppet.notice "Caught #{signal}; calling #{method}"
+                send(method)
+            end
         end
+    end
+
+    # Stop everything
+    def stop(args = {:exit => true})
+        server.stop if server
+
+        agent.stop if agent
+
+        remove_pidfile()
+
+        Puppet::Util::Log.close_all
+
+        exit if args[:exit]
+    end
+
+    def start
+        set_signal_traps
+
+        create_pidfile
+
+        raise Puppet::DevError, "Daemons must have an agent, server, or both" unless agent or server
+        agent.start if agent
+        server.start if server
 
-        super
+        EventLoop.current.run
     end
 end
 

data/lib/puppet/defaults.rb

@@ -31,15 +31,15 @@ module Puppet
     if name == "puppetmasterd"
         logopts = {:default => "$vardir/log",
             :mode => 0750,
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :desc => "The Puppet log directory."
         }
     else
         logopts = ["$vardir/log", "The Puppet log directory."]
     end
     setdefaults(:main, :logdir => logopts)
-    
+
     # This name hackery is necessary so that the rundir is set reasonably during
     # unit tests.
     if Process.uid == 0 and %w{puppetd puppetmasterd}.include?(self.name)
@@ -60,13 +60,7 @@ module Puppet
                 this directory can be removed without causing harm (although it
                 might result in spurious service restarts)."
         },
-        :ssldir => {
-            :default => "$confdir/ssl",
-            :mode => 0771,
-            :owner => "root",
-            :desc => "Where SSL certificates are kept."
-        },
-        :rundir => { 
+        :rundir => {
             :default => rundir,
             :mode => 01777,
             :desc => "Where Puppet PID files are kept."
@@ -97,8 +91,8 @@ module Puppet
                 from the parent process.",
             :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
             :hook => proc do |value|
+                ENV["PATH"] = "" if ENV["PATH"].nil?
                 ENV["PATH"] = value unless value == "none"
-
                 paths = ENV["PATH"].split(File::PATH_SEPARATOR)
                 %w{/usr/sbin /sbin}.each do |path|
                     unless paths.include?(path)
@@ -137,7 +131,7 @@ module Puppet
             ``puppetmasterd``) this provides the default environment for nodes
             we know nothing about."
         },
-        :diff_args => ["", "Which arguments to pass to the diff command when printing differences between files."],
+        :diff_args => ["-u", "Which arguments to pass to the diff command when printing differences between files."],
         :diff => ["diff", "Which diff command to use when printing differences between files."],
         :show_diff => [false, "Whether to print a contextual diff when files are being replaced.  The diff
             is printed on stdout, so this option is meaningless unless you are running Puppet interactively.
@@ -150,7 +144,55 @@ module Puppet
             but then ship with tools that do not know how to handle signed ints, so the UIDs show up as
             huge numbers that can then not be fed back into the system.  This is a hackish way to fail in a
             slightly more useful way when that happens."],
-        :node_terminus => ["plain", "Where to find information about nodes."]
+        :node_terminus => ["plain", "Where to find information about nodes."],
+        :httplog => { :default => "$logdir/http.log",
+            :owner => "root",
+            :mode => 0640,
+            :desc => "Where the puppetd web server logs."
+        },
+        :http_proxy_host => ["none",
+            "The HTTP proxy host to use for outgoing connections.  Note: You
+            may need to use a FQDN for the server hostname when using a proxy."],
+        :http_proxy_port => [3128,
+            "The HTTP proxy port to use for outgoing connections"],
+        :http_enable_post_connection_check => [true,
+            "Boolean; wheter or not puppetd should validate the server
+            SSL certificate against the request hostname."],
+        :filetimeout => [ 15,
+            "The minimum time to wait (in seconds) between checking for updates in
+            configuration files.  This timeout determines how quickly Puppet checks whether
+            a file (such as manifests or templates) has changed on disk."
+        ],
+        :queue_type => ["stomp", "Which type of queue to use for asynchronous processing."],
+        :queue_type => ["stomp", "Which type of queue to use for asynchronous processing."],
+        :queue_source => ["stomp://localhost:61613/", "Which type of queue to use for asynchronous processing.  If your stomp server requires
+            authentication, you can include it in the URI as long as your stomp client library is at least 1.1.1"],
+        :async_storeconfigs => {:default => false, :desc => "Whether to use a queueing system to provide asynchronous database integration.
+            Requires that ``puppetqd`` be running and that 'JSON' support for ruby be installed.",
+            :hook => proc do |value|
+                if value
+                    # This reconfigures the terminii for Node, Facts, and Catalog
+                    Puppet.settings[:storeconfigs] = true
+
+                    # But then we modify the configuration
+                    Puppet::Resource::Catalog.cache_class = :queue
+                else
+                    raise "Cannot disable asynchronous storeconfigs in a running process"
+                end
+            end
+        },
+        :thin_storeconfigs => {:default => false, :desc =>
+            "Boolean; wether storeconfigs store in the database only the facts and exported resources.
+            If true, then storeconfigs performance will be higher and still allow exported/collected
+            resources, but other usage external to Puppet might not work",
+            :hook => proc do |value|
+                    Puppet.settings[:storeconfigs] = true if value
+                end
+            },
+        :config_version => ["", "How to determine the configuration version.  By default, it will be the
+            time that the configuration is parsed, but you can provide a shell script to override how the
+            version is determined.  The output of this script will be added to every log message in the
+            reports, allowing you to correlate changes on your hosts to the source version on the server."]
     )
 
     hostname = Facter["hostname"].value
@@ -161,8 +203,8 @@ module Puppet
         fqdn = hostname
     end
 
-    Puppet.setdefaults(:ssl,
-        # We have to downcase the fqdn, because the current ssl stuff (as oppsed to in master) doesn't have good facilities for 
+    Puppet.setdefaults(:main,
+        # We have to downcase the fqdn, because the current ssl stuff (as oppsed to in master) doesn't have good facilities for
         # manipulating naming.
         :certname => {:default => fqdn.downcase, :desc => "The name to use when handling certificates.  Defaults
             to the fully qualified domain name.",
@@ -171,100 +213,138 @@ module Puppet
         :certdnsnames => ['', "The DNS names on the Server certificate as a colon-separated list.
             If it's anything other than an empty string, it will be used as an alias in the created
             certificate.  By default, only the server gets an alias set up, and only for 'puppet'."],
-        :certdir => ["$ssldir/certs", "The certificate directory."],
-        :publickeydir => ["$ssldir/public_keys", "The public key directory."],
+        :certdir => {
+            :default => "$ssldir/certs",
+            :owner => "service",
+            :desc => "The certificate directory."
+        },
+        :ssldir => {
+            :default => "$confdir/ssl",
+            :mode => 0771,
+            :owner => "service",
+            :desc => "Where SSL certificates are kept."
+        },
+        :publickeydir => {
+            :default => "$ssldir/public_keys",
+            :owner => "service",
+            :desc => "The public key directory."
+        },
+        :requestdir => {
+            :default => "$ssldir/certificate_requests",
+            :owner => "service",
+            :desc => "Where host certificate requests are stored."
+        },
         :privatekeydir => { :default => "$ssldir/private_keys",
             :mode => 0750,
+            :owner => "service",
             :desc => "The private key directory."
         },
         :privatedir => { :default => "$ssldir/private",
             :mode => 0750,
+            :owner => "service",
             :desc => "Where the client stores private certificate information."
         },
         :passfile => { :default => "$privatedir/password",
             :mode => 0640,
+            :owner => "service",
             :desc => "Where puppetd stores the password for its private key.
                 Generally unused."
         },
         :hostcsr => { :default => "$ssldir/csr_$certname.pem",
             :mode => 0644,
-            :desc => "Where individual hosts store and look for their certificates."
+            :owner => "service",
+            :desc => "Where individual hosts store and look for their certificate requests."
         },
         :hostcert => { :default => "$certdir/$certname.pem",
             :mode => 0644,
+            :owner => "service",
             :desc => "Where individual hosts store and look for their certificates."
         },
         :hostprivkey => { :default => "$privatekeydir/$certname.pem",
             :mode => 0600,
+            :owner => "service",
             :desc => "Where individual hosts store and look for their private key."
         },
         :hostpubkey => { :default => "$publickeydir/$certname.pem",
             :mode => 0644,
+            :owner => "service",
             :desc => "Where individual hosts store and look for their public key."
         },
         :localcacert => { :default => "$certdir/ca.pem",
             :mode => 0644,
+            :owner => "service",
             :desc => "Where each client stores the CA certificate."
+        },
+        :hostcrl => { :default => "$ssldir/crl.pem",
+            :mode => 0644,
+            :owner => "service",
+            :desc => "Where the host's certificate revocation list can be found.
+                This is distinct from the certificate authority's CRL."
         }
     )
 
     setdefaults(:ca,
         :cadir => {  :default => "$ssldir/ca",
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :mode => 0770,
             :desc => "The root directory for the certificate authority."
         },
         :cacert => { :default => "$cadir/ca_crt.pem",
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :mode => 0660,
             :desc => "The CA certificate."
         },
         :cakey => { :default => "$cadir/ca_key.pem",
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :mode => 0660,
             :desc => "The CA private key."
         },
         :capub => { :default => "$cadir/ca_pub.pem",
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :desc => "The CA public key."
         },
         :cacrl => { :default => "$cadir/ca_crl.pem",
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :mode => 0664,
-            :desc => "The certificate revocation list (CRL) for the CA. Set this to 'false' if you do not want to use a CRL."
+            :desc => "The certificate revocation list (CRL) for the CA. Will be used if present but otherwise ignored.",
+            :hook => proc do |value|
+                if value == 'false'
+                    Puppet.warning "Setting the :cacrl to 'false' is deprecated; Puppet will just ignore the crl if yours is missing"
+                end
+            end
         },
         :caprivatedir => { :default => "$cadir/private",
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :mode => 0770,
             :desc => "Where the CA stores private certificate information."
         },
         :csrdir => { :default => "$cadir/requests",
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :desc => "Where the CA stores certificate requests"
         },
         :signeddir => { :default => "$cadir/signed",
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :mode => 0770,
             :desc => "Where the CA stores signed certificates."
         },
         :capass => { :default => "$caprivatedir/ca.pass",
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :mode => 0660,
             :desc => "Where the CA stores the password for the private key"
         },
         :serial => { :default => "$cadir/serial",
-            :owner => "$user",
-            :group => "$group",
-            :mode => 0600,
+            :owner => "service",
+            :group => "service",
+            :mode => 0644,
             :desc => "Where the serial number for certificates is stored."
         },
         :autosign => { :default => "$confdir/autosign.conf",
@@ -273,13 +353,13 @@ module Puppet
                 autosigns any key request, and is a very bad idea), false (which
                 never autosigns any key request), and the path to a file, which
                 uses that configuration file to determine which keys to sign."},
-        :ca_days => ["", "How long a certificate should be valid. 
+        :ca_days => ["", "How long a certificate should be valid.
                  This parameter is deprecated, use ca_ttl instead"],
-        :ca_ttl => ["5y", "The default TTL for new certificates; valid values 
-                must be an integer, optionally followed by one of the units 
-                'y' (years of 365 days), 'd' (days), 'h' (hours), or 
+        :ca_ttl => ["5y", "The default TTL for new certificates; valid values
+                must be an integer, optionally followed by one of the units
+                'y' (years of 365 days), 'd' (days), 'h' (hours), or
                 's' (seconds). The unit defaults to seconds. If this parameter
-                is set, ca_days is ignored. Examples are '3600' (one hour) 
+                is set, ca_days is ignored. Examples are '3600' (one hour)
                 and '1825d', which is the same as '5y' (5 years) "],
         :ca_md => ["md5", "The type of hash used in certificates."],
         :req_bits => [2048, "The bit length of the certificates."],
@@ -287,8 +367,8 @@ module Puppet
         :cert_inventory => {
             :default => "$cadir/inventory.txt",
             :mode => 0644,
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :desc => "A Complete listing of all certificates"
         }
     )
@@ -297,13 +377,16 @@ module Puppet
     self.setdefaults(self.settings[:name],
         :config => ["$confdir/puppet.conf",
             "The configuration file for #{Puppet[:name]}."],
-        :pidfile => ["", "The pid file"],
-        :bindaddress => ["", "The address to bind to.  Mongrel servers
+        :pidfile => ["$rundir/$name.pid", "The pid file"],
+        :bindaddress => ["", "The address a listening server should bind to.  Mongrel servers
             default to 127.0.0.1 and WEBrick defaults to 0.0.0.0."],
-        :servertype => ["webrick", "The type of server to use.  Currently supported
+        :servertype => {:default => "webrick", :desc => "The type of server to use.  Currently supported
             options are webrick and mongrel.  If you use mongrel, you will need
             a proxy in front of the process or processes, since Mongrel cannot
-            speak SSL."]
+            speak SSL.",
+            :call_on_define => true, # Call our hook with the default value, so we always get the correct bind address set.
+            :hook => proc { |value|  value == "webrick" ? Puppet.settings[:bindaddress] = "0.0.0.0" : Puppet.settings[:bindaddress] = "127.0.0.1" if Puppet.settings[:bindaddress] == "" }
+        }
     )
 
     self.setdefaults(:puppetmasterd,
@@ -317,38 +400,43 @@ module Puppet
             by ``puppet``, and should only be set if you're writing your own Puppet
             executable"],
         :masterlog => { :default => "$logdir/puppetmaster.log",
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :mode => 0660,
             :desc => "Where puppetmasterd logs.  This is generally not used,
                 since syslog is the default log destination."
         },
         :masterhttplog => { :default => "$logdir/masterhttp.log",
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :mode => 0660,
             :create => true,
             :desc => "Where the puppetmasterd web server logs."
         },
         :masterport => [8140, "Which port puppetmasterd listens on."],
         :parseonly => [false, "Just check the syntax of the manifests."],
-        :node_name => ["cert", "How the puppetmaster determines the client's identity 
-           and sets the 'hostname', 'fqdn' and 'domain' facts for use in the manifest, 
-           in particular for determining which 'node' statement applies to the client. 
-           Possible values are 'cert' (use the subject's CN in the client's 
-           certificate) and 'facter' (use the hostname that the client 
+        :node_name => ["cert", "How the puppetmaster determines the client's identity
+           and sets the 'hostname', 'fqdn' and 'domain' facts for use in the manifest,
+           in particular for determining which 'node' statement applies to the client.
+           Possible values are 'cert' (use the subject's CN in the client's
+           certificate) and 'facter' (use the hostname that the client
            reported in its facts)"],
         :bucketdir => {
             :default => "$vardir/bucket",
             :mode => 0750,
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :desc => "Where FileBucket files are stored."
         },
+        :rest_authconfig => [ "$confdir/auth.conf",
+            "The configuration file that defines the rights to the different
+            rest indirections.  This can be used as a fine-grained
+            authorization system for ``puppetmasterd``."
+        ],
         :ca => [true, "Wether the master should function as a certificate authority."],
-        :modulepath => [ "$confdir/modules:/usr/share/puppet/modules",
-           "The search path for modules as a colon-separated list of
-            directories." ],
+        :modulepath => {:default => "$confdir/modules:/usr/share/puppet/modules",
+           :desc => "The search path for modules as a colon-separated list of
+            directories.", :type => :setting }, # We don't want this to be considered a file, since it's multiple files.
         :ssl_client_header => ["HTTP_X_CLIENT_DN", "The header containing an authenticated
             client's SSL DN.  Only used with Mongrel.  This header must be set by the proxy
             to the authenticated client's SSL DN (e.g., ``/CN=puppet.reductivelabs.com``).
@@ -359,10 +447,34 @@ module Puppet
             See http://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information."],
         # To make sure this directory is created before we try to use it on the server, we need
         # it to be in the server section (#1138).
-        :yamldir => {:default => "$vardir/yaml", :owner => "$user", :group => "$user", :mode => "750",
+        :yamldir => {:default => "$vardir/yaml", :owner => "service", :group => "service", :mode => "750",
             :desc => "The directory in which YAML data is stored, usually in a subdirectory."},
-        :clientyamldir => {:default => "$vardir/client_yaml", :mode => "750",
-            :desc => "The directory in which client-side YAML data is stored."}
+        :reports => ["store",
+            "The list of reports to generate.  All reports are looked for
+            in puppet/reports/<name>.rb, and multiple report names should be
+            comma-separated (whitespace is okay)."
+        ],
+        :reportdir => {:default => "$vardir/reports",
+                :mode => 0750,
+                :owner => "service",
+                :group => "service",
+                :desc => "The directory in which to store reports
+                    received from the client.  Each client gets a separate
+                    subdirectory."},
+        :fileserverconfig => ["$confdir/fileserver.conf",
+            "Where the fileserver configuration is stored."],
+        :rrddir => {:default => "$vardir/rrd",
+            :owner => "service",
+            :group => "service",
+            :desc => "The directory where RRD database files are stored.
+                Directories for each reporting host will be created under
+                this directory."
+        },
+        :rrdinterval => ["$runinterval", "How often RRD should expect data.
+            This should match how often the hosts report back to the server."],
+        :strict_hostname_checking => [false, "Whether to only search for the complete
+            hostname as it is in the certificate when searching for node information
+            in the catalogs."]
     )
 
     self.setdefaults(:puppetd,
@@ -378,6 +490,8 @@ module Puppet
                 this file reflects the state discovered through interacting
                 with clients."
             },
+        :clientyamldir => {:default => "$vardir/client_yaml", :mode => "750",
+            :desc => "The directory in which client-side YAML data is stored."},
         :classfile => { :default => "$statedir/classes.txt",
             :owner => "root",
             :mode => 0644,
@@ -390,19 +504,6 @@ module Puppet
             :mode => 0640,
             :desc => "The log file for puppetd.  This is generally not used."
         },
-        :httplog => { :default => "$logdir/http.log",
-            :owner => "root",
-            :mode => 0640,
-            :desc => "Where the puppetd web server logs."
-        },
-        :http_proxy_host => ["none",
-            "The HTTP proxy host to use for outgoing connections.  Note: You
-            may need to use a FQDN for the server hostname when using a proxy."],
-        :http_proxy_port => [3128,
-            "The HTTP proxy port to use for outgoing connections"],
-        :http_enable_post_connection_check => [true,
-            "Boolean; wheter or not puppetd should validate the server
-            SSL certificate against the request hostname."],
         :server => ["puppet",
             "The server to which server puppetd should connect"],
         :ignoreschedules => [false,
@@ -421,37 +522,11 @@ module Puppet
             authority requests.  It's a separate server because it cannot
             and does not need to horizontally scale."],
         :ca_port => ["$masterport", "The port to use for the certificate authority."],
-        :catalog_format => ["yaml", "What format to use to dump the catalog.  Only supports
-            'marshal' and 'yaml'.  Only matters on the client, since it asks the server
-            for a specific format."]
-    )
-        
-    self.setdefaults(:filebucket,
-        :clientbucketdir => {
-            :default => "$vardir/clientbucket",
-            :mode => 0750,
-            :desc => "Where FileBucket files are stored locally."
-        }
-    )
-    self.setdefaults(:fileserver,
-        :fileserverconfig => ["$confdir/fileserver.conf",
-            "Where the fileserver configuration is stored."]
-    )
-    self.setdefaults(:reporting,
-        :reports => ["store",
-            "The list of reports to generate.  All reports are looked for
-            in puppet/reports/<name>.rb, and multiple report names should be
-            comma-separated (whitespace is okay)."
-        ],
-        :reportdir => {:default => "$vardir/reports",
-                :mode => 0750,
-                :owner => "$user",
-                :group => "$group",
-                :desc => "The directory in which to store reports
-                    received from the client.  Each client gets a separate
-                    subdirectory."}
-    )
-    self.setdefaults(:puppetd,
+        :preferred_serialization_format => ["json", "The preferred means of serializing
+            ruby instances for passing over the wire.  This won't guarantee that all
+            instances will be serialized using this method, since not all classes
+            can be guaranteed to support this format, but it will be used for all
+            classes that support it."],
         :puppetdlockfile => [ "$statedir/puppetdlock",
             "A lock file to temporarily stop puppetd from doing anything."],
         :usecacheonfailure => [true,
@@ -477,30 +552,44 @@ module Puppet
             run interval."],
         :splay => [false,
             "Whether to sleep for a pseudo-random (but consistent) amount of time before
-            a run."]
-    )
-
-    self.setdefaults(:puppetd,
+            a run."],
+        :clientbucketdir => {
+            :default => "$vardir/clientbucket",
+            :mode => 0750,
+            :desc => "Where FileBucket files are stored locally."
+        },
         :configtimeout => [120,
             "How long the client should wait for the configuration to be retrieved
             before considering it a failure.  This can help reduce flapping if too
             many clients contact the server at one time."
         ],
-        :reportserver => ["$server",
-            "The server to which to send transaction reports."
+        :reportserver => {
+            :default => "$server",
+            :call_on_define => false,
+            :desc => "(Deprecated for 'report_server') The server to which to send transaction reports.",
+            :hook => proc do |value|
+              if value
+                Puppet.settings[:report_server] = value
+              end
+            end   
+        },
+        :report_server => ["$server",
+          "The server to which to send transaction reports."
+        ],
+        :report_port => ["$masterport",
+          "The port to communicate with the report_server."
         ],
         :report => [false,
             "Whether to send reports after every transaction."
-        ]
+        ],
+        :graph => [false, "Whether to create dot graph files for the different
+            configuration graphs.  These dot files can be interpreted by tools
+            like OmniGraffle or dot (which is part of ImageMagick)."],
+        :graphdir => ["$statedir/graphs", "Where to store dot-outputted graphs."]
     )
 
     # Plugin information.
     self.setdefaults(:main,
-        :pluginpath => ["$vardir/plugins",
-            "Where Puppet should look for plugins.  Multiple directories should
-            be colon-separated, like normal PATH variables.  As of 0.23.1, this
-            option is deprecated; download your custom libraries to the $libdir
-            instead."],
         :plugindest => ["$libdir",
             "Where Puppet should store plugins that it pulls down from the central
             server."],
@@ -510,21 +599,22 @@ module Puppet
              be used here."],
         :pluginsync => [false,
             "Whether plugins should be synced with the central server."],
-        :pluginsignore => [".svn CVS",
+        :pluginsignore => [".svn CVS .git",
             "What files to ignore when pulling down plugins."]
     )
 
     # Central fact information.
     self.setdefaults(:main,
-        :factpath => {:default => "$vardir/facts",
+        :factpath => {:default => "$vardir/facts/",
             :desc => "Where Puppet should look for facts.  Multiple directories should
                 be colon-separated, like normal PATH variables.",
             :call_on_define => true, # Call our hook with the default value, so we always get the value added to facter.
+            :type => :setting, # Don't consider it a file, because it could be multiple colon-separated files
             :hook => proc { |value| Facter.search(value) if Facter.respond_to?(:search) }},
-        :factdest => ["$vardir/facts",
+        :factdest => ["$vardir/facts/",
             "Where Puppet should store facts that it pulls down from the central
             server."],
-        :factsource => ["puppet://$server/facts",
+        :factsource => ["puppet://$server/facts/",
             "From where to retrieve facts.  The standard Puppet ``file`` type
              is used for retrieval, so anything that is a valid file source can
              be used here."],
@@ -548,8 +638,8 @@ module Puppet
     self.setdefaults(:rails,
         :dblocation => { :default => "$statedir/clientconfigs.sqlite3",
             :mode => 0660,
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :desc => "The database cache for client configurations.  Used for
                 querying within the language."
         },
@@ -566,8 +656,8 @@ module Puppet
             databases are used.  Will be ignored if the value is an empty string."],
         :railslog => {:default => "$logdir/rails.log",
             :mode => 0600,
-            :owner => "$user",
-            :group => "$group",
+            :owner => "service",
+            :group => "service",
             :desc => "Where Rails-specific logs are sent"
         },
         :rails_loglevel => ["info", "The log level for Rails connections.  The value must be
@@ -575,13 +665,6 @@ module Puppet
             and other environments normally use ``debug``."]
     )
 
-    setdefaults(:graphing,
-        :graph => [false, "Whether to create dot graph files for the different
-            configuration graphs.  These dot files can be interpreted by tools
-            like OmniGraffle or dot (which is part of ImageMagick)."],
-        :graphdir => ["$statedir/graphs", "Where to store dot-outputted graphs."]
-    )
-
     setdefaults(:transaction,
         :tags => ["", "Tags to use to find resources.  If this is set, then
             only resources tagged with the specified tags will be applied.
@@ -598,7 +681,7 @@ module Puppet
         :typecheck => [true, "Whether to validate types during parsing."],
         :paramcheck => [true, "Whether to validate parameters during parsing."]
     )
-    
+
     setdefaults(:main,
         :casesensitive => [false,
             "Whether matching in case statements and selectors
@@ -617,7 +700,7 @@ module Puppet
     setdefaults(:ldap,
         :ldapnodes => [false,
             "Whether to search for node configurations in LDAP.  See
-            http://reductivelabs.com/puppet/trac/wiki/LdapNodes/ for more information."],
+            http://reductivelabs.com/trac/puppet/wiki/LDAPNodes for more information."],
         :ldapssl => [false,
             "Whether SSL should be used when searching for nodes.
             Defaults to false because SSL usually requires certificates
@@ -659,9 +742,21 @@ module Puppet
     )
 
     setdefaults(:puppetmasterd,
-        :storeconfigs => [false,
-            "Whether to store each client's configuration.  This
-             requires ActiveRecord from Ruby on Rails."]
+        :storeconfigs => {:default => false, :desc => "Whether to store each client's configuration.  This
+            requires ActiveRecord from Ruby on Rails.",
+            :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
+            :hook => proc do |value|
+                require 'puppet/node'
+                require 'puppet/node/facts'
+                require 'puppet/resource/catalog'
+                if value
+                    raise "StoreConfigs not supported without ActiveRecord 2.1 or higher" unless Puppet.features.rails?
+                    Puppet::Resource::Catalog.cache_class = :active_record unless Puppet.settings[:async_storeconfigs]
+                    Puppet::Node::Facts.cache_class = :active_record
+                    Puppet::Node.cache_class = :active_record
+                end
+            end
+        }
     )
 
     # This doesn't actually work right now.
@@ -672,26 +767,4 @@ module Puppet
              directories."
         ]
     )
-
-    setdefaults(:main,
-        :filetimeout => [ 15,
-            "The minimum time to wait (in seconds) between checking for updates in
-            configuration files.  This timeout determines how quickly Puppet checks whether
-            a file (such as manifests or templates) has changed on disk."
-        ]
-    )
-
-    setdefaults(:metrics,
-        :rrddir => {:default => "$vardir/rrd",
-            :owner => "$user",
-            :group => "$group",
-            :desc => "The directory where RRD database files are stored.
-                Directories for each reporting host will be created under
-                this directory."
-        },
-        :rrdgraph => [false, "Whether RRD information should be graphed."],
-        :rrdinterval => ["$runinterval", "How often RRD should expect data.
-            This should match how often the hosts report back to the server."]
-    )
 end
-