diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb
index ac2cc1002..35d6024be 100644
--- a/lib/puppet/application.rb
+++ b/lib/puppet/application.rb
@@ -1,398 +1,411 @@
 require 'optparse'
 
 # This class handles all the aspects of a Puppet application/executable
 # * setting up options
 # * setting up logs
 # * choosing what to run
 # * representing execution status
 #
 # === Usage
 # An application is a subclass of Puppet::Application.
 #
 # For legacy compatibility,
 #      Puppet::Application[:example].run
 # is equivalent to  
 #      Puppet::Application::Example.new.run
 #
 #
 # class Puppet::Application::Example << Puppet::Application
 #
 #     def preinit
 #         # perform some pre initialization
 #         @all = false
 #     end
 #
 #     # run_command is called to actually run the specified command
 #     def run_command
 #         send Puppet::Util::CommandLine.new.args.shift
 #     end
 #
 #     # option uses metaprogramming to create a method
 #     # and also tells the option parser how to invoke that method
 #     option("--arg ARGUMENT") do |v|
 #         @args << v
 #     end
 #
 #     option("--debug", "-d") do |v|
 #         @debug = v
 #     end
 #
 #     option("--all", "-a:) do |v|
 #         @all = v
 #     end
 #
 #     def handle_unknown(opt,arg)
 #         # last chance to manage an option
 #         ...
 #         # let's say to the framework we finally handle this option
 #         true
 #     end
 #
 #     def read
 #         # read action
 #     end
 #
 #     def write
 #         # writeaction
 #     end
 #
 # end
 #
 # === Preinit
 # The preinit block is the first code to be called in your application, before option parsing,
 # setup or command execution.
 #
 # === Options
 # Puppet::Application uses +OptionParser+ to manage the application options.
 # Options are defined with the +option+ method to which are passed various
 # arguments, including the long option, the short option, a description...
 # Refer to +OptionParser+ documentation for the exact format.
 # * If the option method is given a block, this one will be called whenever
 # the option is encountered in the command-line argument.
 # * If the option method has no block, a default functionnality will be used, that
 # stores the argument (or true/false if the option doesn't require an argument) in
 # the global (to the application) options array.
 # * If a given option was not defined by a the +option+ method, but it exists as a Puppet settings:
 #  * if +unknown+ was used with a block, it will be called with the option name and argument
 #  * if +unknown+ wasn't used, then the option/argument is handed to Puppet.settings.handlearg for
 #    a default behavior
 #
 # --help is managed directly by the Puppet::Application class, but can be overriden.
 #
 # === Setup
 # Applications can use the setup block to perform any initialization.
 # The defaul +setup+ behaviour is to: read Puppet configuration and manage log level and destination
 #
 # === What and how to run
 # If the +dispatch+ block is defined it is called. This block should return the name of the registered command
 # to be run.
 # If it doesn't exist, it defaults to execute the +main+ command if defined.
 #
 # === Execution state
 # The class attributes/methods of Puppet::Application serve as a global place to set and query the execution
 # status of the application: stopping, restarting, etc.  The setting of the application status does not directly
 # aftect its running status; it's assumed that the various components within the application will consult these
 # settings appropriately and affect their own processing accordingly.  Control operations (signal handlers and
 # the like) should set the status appropriately to indicate to the overall system that it's the process of
 # stopping or restarting (or just running as usual).
 #
 # So, if something in your application needs to stop the process, for some reason, you might consider:
 #
 #  def stop_me!
 #      # indicate that we're stopping
 #      Puppet::Application.stop!
 #      # ...do stuff...
 #  end
 #
 # And, if you have some component that involves a long-running process, you might want to consider:
 #
 #  def my_long_process(giant_list_to_munge)
 #      giant_list_to_munge.collect do |member|
 #          # bail if we're stopping
 #          return if Puppet::Application.stop_requested?
 #          process_member(member)
 #      end
 #  end
 module Puppet
 class Application
     require 'puppet/util'
     include Puppet::Util
 
     BINDIRS = %w{sbin bin}.map{|dir| File.expand_path(File.dirname(__FILE__)) + "/../../#{dir}/*"}.join(" ")
 
     class << self
         include Puppet::Util
 
         attr_accessor :run_status
 
         def clear!
             self.run_status = nil
         end
 
         def stop!
             self.run_status = :stop_requested
         end
 
         def restart!
             self.run_status = :restart_requested
         end
 
         # Indicates that Puppet::Application.restart! has been invoked and components should
         # do what is necessary to facilitate a restart.
         def restart_requested?
             :restart_requested == run_status
         end
 
         # Indicates that Puppet::Application.stop! has been invoked and components should do what is necessary
         # for a clean stop.
         def stop_requested?
             :stop_requested == run_status
         end
 
         # Indicates that one of stop! or start! was invoked on Puppet::Application, and some kind of process
         # shutdown/short-circuit may be necessary.
         def interrupted?
             [:restart_requested, :stop_requested].include? run_status
         end
 
         # Indicates that Puppet::Application believes that it's in usual running run_mode (no stop/restart request
         # currently active).
         def clear?
             run_status.nil?
         end
 
         # Only executes the given block if the run status of Puppet::Application is clear (no restarts, stops,
         # etc. requested).
         # Upon block execution, checks the run status again; if a restart has been requested during the block's
         # execution, then controlled_run will send a new HUP signal to the current process.
         # Thus, long-running background processes can potentially finish their work before a restart.
         def controlled_run(&block)
             return unless clear?
             result = block.call
             Process.kill(:HUP, $$) if restart_requested?
             result
         end
 
         def should_parse_config
             @parse_config = true
         end
 
         def should_not_parse_config
             @parse_config = false
         end
 
         def should_parse_config?
             if ! defined? @parse_config
                 @parse_config = true
             end
             return @parse_config
         end
 
         # used to declare code that handle an option
         def option(*options, &block)
             long = options.find { |opt| opt =~ /^--/ }.gsub(/^--(?:\[no-\])?([^ =]+).*$/, '\1' ).gsub('-','_')
             fname = symbolize("handle_#{long}")
             if (block_given?)
                 define_method(fname, &block)
             else
                 define_method(fname) do |value|
                     self.options["#{long}".to_sym] = value
                 end
             end
             self.option_parser_commands << [options, fname]
         end
 
         def banner(banner = nil)
             @banner ||= banner
         end
 
         def option_parser_commands
             @option_parser_commands ||= (
                 superclass.respond_to?(:option_parser_commands) ? superclass.option_parser_commands.dup : []
             )
             @option_parser_commands
         end
 
         def find(name)
             begin
                 self.const_get(name.to_s.capitalize)
             rescue
                 puts "Const '#{name.to_s.capitalize}' appears to be undefined. Unable to continue without it."
                 Kernel::exit(1)
             end
         end
 
         def [](name)
             find(name).new
         end
 
         # Sets or gets the run_mode name. Sets the run_mode name if a mode_name is
         # passed. Otherwise, gets the run_mode or a default run_mode
         #
         def run_mode( mode_name = nil)
             return @run_mode if @run_mode and not mode_name
 
             require 'puppet/util/run_mode'
             @run_mode = Puppet::Util::RunMode[ mode_name || :user ]
         end
     end
 
     attr_reader :options, :command_line
 
     # Every app responds to --version
     option("--version", "-V") do |arg|
         puts "%s" % Puppet.version
         exit
     end
 
     # Every app responds to --help
     option("--help", "-h") do |v|
         help
     end
 
     def should_parse_config?
         self.class.should_parse_config?
     end
 
     # override to execute code before running anything else
     def preinit
     end
 
     def option_parser
         return @option_parser if defined? @option_parser
 
         @option_parser = OptionParser.new(self.class.banner)
 
         self.class.option_parser_commands.each do |options, fname|
             @option_parser.on(*options) do |value|
                 self.send(fname, value)
             end
         end
         @option_parser.default_argv = self.command_line.args
         @option_parser
     end
 
     def initialize(command_line = nil)
         require 'puppet/util/command_line'
         @command_line = command_line || Puppet::Util::CommandLine.new
         @run_mode = self.class.run_mode
         @options = {}
 
         $puppet_application_mode = @run_mode
         $puppet_application_name = name
+        
+        if Puppet.respond_to? :settings
+            # This is to reduce the amount of confusion in rspec
+            # because it might have loaded defaults.rb before the globals were set
+            # and thus have the wrong defaults for the current application
+            Puppet.settings.set_value(:confdir, Puppet.run_mode.conf_dir, :mutable_defaults)
+            Puppet.settings.set_value(:vardir, Puppet.run_mode.var_dir, :mutable_defaults)
+            Puppet.settings.set_value(:name, Puppet.application_name.to_s, :mutable_defaults)
+            Puppet.settings.set_value(:logdir, Puppet.run_mode.logopts, :mutable_defaults)
+            Puppet.settings.set_value(:rundir, Puppet.run_mode.run_dir, :mutable_defaults)
+            Puppet.settings.set_value(:mode, Puppet.run_mode.name.to_s, :mutable_defaults)
+        end
+
         require 'puppet'
     end
 
     # This is the main application entry point
     def run
         exit_on_fail("initialize") { preinit }
         exit_on_fail("parse options") { parse_options }
         exit_on_fail("parse configuration file") { Puppet.settings.parse } if should_parse_config?
         exit_on_fail("prepare for execution") { setup }
         exit_on_fail("run") { run_command }
     end
 
     def main
         raise NotImplementedError, "No valid command or main"
     end
 
     def run_command
         main
     end
 
     def setup
         # Handle the logging settings
         if options[:debug] or options[:verbose]
             Puppet::Util::Log.newdestination(:console)
             if options[:debug]
                 Puppet::Util::Log.level = :debug
             else
                 Puppet::Util::Log.level = :info
             end
         end
 
         unless options[:setdest]
             Puppet::Util::Log.newdestination(:syslog)
         end
     end
 
     def parse_options
         # get all puppet options
         optparse_opt = []
         optparse_opt = Puppet.settings.optparse_addargs(optparse_opt)
 
         # convert them to OptionParser format
         optparse_opt.each do |option|
             self.option_parser.on(*option) do |arg|
                 handlearg(option[0], arg)
             end
         end
 
         # scan command line argument
         begin
             self.option_parser.parse!
         rescue OptionParser::ParseError => detail
             $stderr.puts detail
             $stderr.puts "Try 'puppet #{command_line.subcommand_name} --help'"
             exit(1)
         end
     end
 
     def handlearg(opt, arg)
         # rewrite --[no-]option to --no-option if that's what was given
         if opt =~ /\[no-\]/ and !arg
             opt = opt.gsub(/\[no-\]/,'no-')
         end
         # otherwise remove the [no-] prefix to not confuse everybody
         opt = opt.gsub(/\[no-\]/, '')
         unless respond_to?(:handle_unknown) and send(:handle_unknown, opt, arg)
             # Puppet.settings.handlearg doesn't handle direct true/false :-)
             if arg.is_a?(FalseClass)
                 arg = "false"
             elsif arg.is_a?(TrueClass)
                 arg = "true"
             end
             Puppet.settings.handlearg(opt, arg)
         end
     end
 
     # this is used for testing
     def self.exit(code)
         exit(code)
     end
 
     def name
         self.class.to_s.sub(/.*::/,"").downcase.to_sym
     end
 
     def help
         if Puppet.features.usage?
             # RH:FIXME: My goodness, this is ugly.
             ::RDoc.const_set("PuppetSourceFile", name)
             def (::RDoc).caller
                 docfile = `grep -l 'Puppet::Application\\[:#{::RDoc::PuppetSourceFile}\\]' #{BINDIRS}`.chomp
                 super << "#{docfile}:0"
             end
             ::RDoc::usage && exit
         else
             puts "No help available unless you have RDoc::usage installed"
             exit
         end
     rescue Errno::ENOENT
         puts "No help available for puppet #{name}"
         exit
     end
 
     private
 
     def exit_on_fail(message, code = 1)
         begin
             yield
         rescue RuntimeError, NotImplementedError => detail
             puts detail.backtrace if Puppet[:trace]
             $stderr.puts "Could not %s: %s" % [message, detail]
             exit(code)
         end
     end
 end
 end
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index ac82975eb..ed0623127 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -1,782 +1,783 @@
 # The majority of the system configuration parameters are set in this file.
 module Puppet
     setdefaults(:main,
         :confdir => [Puppet.run_mode.conf_dir, "The main Puppet configuration directory.  The default for this parameter is calculated based on the user.  If the process
         is running as root or the user that ``puppet master`` is supposed to run as, it defaults to a system directory, but if it's running as any other user,
         it defaults to being in ``~``."],
         :vardir => [Puppet.run_mode.var_dir, "Where Puppet stores dynamic and growing data.  The default for this parameter is calculated specially, like `confdir`_."],
         :name => [Puppet.application_name.to_s, "The name of the application, if we are running as one.  The
-            default is essentially $0 without the path or ``.rb``."]
+            default is essentially $0 without the path or ``.rb``."],
+        :mode => [Puppet.run_mode.name.to_s, "The effective 'run mode' of the application: master, agent, or user."]
     )
 
     setdefaults(:main, :logdir => Puppet.run_mode.logopts)
 
     setdefaults(:main,
         :trace => [false, "Whether to print stack traces on some errors"],
         :autoflush => [false, "Whether log files should always flush to disk."],
         :syslogfacility => ["daemon", "What syslog facility to use when logging to
             syslog.  Syslog has a fixed list of valid facilities, and you must
             choose one of those; you cannot just make one up."],
         :statedir => { :default => "$vardir/state",
             :mode => 01755,
             :desc => "The directory where Puppet state is stored.  Generally,
                 this directory can be removed without causing harm (although it
                 might result in spurious service restarts)."
         },
         :rundir => {
             :default => Puppet.run_mode.run_dir,
             :mode => 01777,
             :desc => "Where Puppet PID files are kept."
         },
         :genconfig => [false,
             "Whether to just print a configuration to stdout and exit.  Only makes
             sense when used interactively.  Takes into account arguments specified
             on the CLI."],
         :genmanifest => [false,
             "Whether to just print a manifest to stdout and exit.  Only makes
             sense when used interactively.  Takes into account arguments specified
             on the CLI."],
         :configprint => ["",
             "Print the value of a specific configuration parameter.  If a
             parameter is provided for this, then the value is printed and puppet
             exits.  Comma-separate multiple values.  For a list of all values,
             specify 'all'.  This feature is only available in Puppet versions
             higher than 0.18.4."],
         :color => ["ansi", "Whether to use colors when logging to the console.
             Valid values are ``ansi`` (equivalent to ``true``), ``html`` (mostly
             used during testing with TextMate), and ``false``, which produces
             no color."],
         :mkusers => [false,
             "Whether to create the necessary user and group that puppet agent will
             run as."],
         :manage_internal_file_permissions => [true,
             "Whether Puppet should manage the owner, group, and mode of files
             it uses internally"
             ],
         :onetime => [false,
             "Run the configuration once, rather than as a long-running
              daemon. This is useful for interactively running puppetd."
             ],
         :path => {:default => "none",
             :desc => "The shell search path.  Defaults to whatever is inherited
                 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)
                         ENV["PATH"] += File::PATH_SEPARATOR + path
                     end
                 end
                 value
             end
         },
         :libdir => {:default => "$vardir/lib",
             :desc => "An extra search path for Puppet.  This is only useful
                 for those files that Puppet will load on demand, and is only
                 guaranteed to work for those cases.  In fact, the autoload
                 mechanism is responsible for making sure this directory
                 is in Ruby's search path",
             :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
             :hook => proc do |value|
                 if defined? @oldlibdir and $:.include?(@oldlibdir)
                     $:.delete(@oldlibdir)
                 end
                 @oldlibdir = value
                 $: << value
             end
         },
         :ignoreimport => [false, "A parameter that can be used in commit
             hooks, since it enables you to parse-check a single file rather
             than requiring that all files exist."],
         :authconfig => [ "$confdir/namespaceauth.conf",
             "The configuration file that defines the rights to the different
             namespaces and methods.  This can be used as a coarse-grained
             authorization system for both ``puppet agent`` and ``puppet master``."
         ],
         :environment => {:default => "production", :desc => "The environment Puppet is running in.  For clients
             (e.g., ``puppet agent``) this determines the environment itself, which
             is used to find modules and much more.  For servers (i.e.,
             ``puppet master``) this provides the default environment for nodes
             we know nothing about."
         },
         :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.
             This feature currently requires the ``diff/lcs`` Ruby library."],
         :daemonize => { :default => true,
             :desc => "Send the process into the background.  This is the default.",
             :short => "D"
         },
         :maximum_uid => [4294967290, "The maximum allowed UID.  Some platforms use negative UIDs
             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."],
         :catalog_terminus => ["compiler", "Where to get node catalogs.  This is useful to change if, for instance,
             you'd like to pre-compile catalogs and store them in memcached or some other easily-accessed store."],
         :facts_terminus => ["facter", "Where to get node facts."],
         :httplog => { :default => "$logdir/http.log",
             :owner => "root",
             :mode => 0640,
             :desc => "Where the puppet agent 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"],
         :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 'PSON' 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."],
         :zlib => [true,
             "Boolean; whether to use the zlib library",
         ],
         :prerun_command => ["", "A command to run before every agent run.  If this command returns a non-zero
             return code, the entire Puppet run will fail."],
         :postrun_command => ["", "A command to run after every agent run.  If this command returns a non-zero
             return code, the entire Puppet run will be considered to have failed, even though it might have
             performed work during the normal run."],
         :freeze_main => [false, "Freezes the 'main' class, disallowing any code to be added to it.  This
             essentially means that you can't have any code outside of a node, class, or definition other
             than in the site manifest."]
     )
 
     hostname = Facter["hostname"].value
     domain = Facter["domain"].value
     if domain and domain != ""
         fqdn = [hostname, domain].join(".")
     else
         fqdn = hostname
     end
 
     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.",
             :call_on_define => true, # Call our hook with the default value, so we're always downcased
             :hook => proc { |value| raise(ArgumentError, "Certificate names must be lower case; see #1168") unless value == value.downcase }},
         :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 => {
             :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 puppet agent stores the password for its private key.
                 Generally unused."
         },
         :hostcsr => { :default => "$ssldir/csr_$certname.pem",
             :mode => 0644,
             :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."
         },
         :certificate_revocation => [true, "Whether certificate revocation should be supported by downloading a Certificate Revocation List (CRL)
             to all clients.  If enabled, CA chaining will almost definitely not work."]
     )
 
     setdefaults(:ca,
         :ca_name => ["$certname", "The name to use the Certificate Authority certificate."],
         :cadir => {  :default => "$ssldir/ca",
             :owner => "service",
             :group => "service",
             :mode => 0770,
             :desc => "The root directory for the certificate authority."
         },
         :cacert => { :default => "$cadir/ca_crt.pem",
             :owner => "service",
             :group => "service",
             :mode => 0660,
             :desc => "The CA certificate."
         },
         :cakey => { :default => "$cadir/ca_key.pem",
             :owner => "service",
             :group => "service",
             :mode => 0660,
             :desc => "The CA private key."
         },
         :capub => { :default => "$cadir/ca_pub.pem",
             :owner => "service",
             :group => "service",
             :desc => "The CA public key."
         },
         :cacrl => { :default => "$cadir/ca_crl.pem",
             :owner => "service",
             :group => "service",
             :mode => 0664,
             :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 => "service",
             :group => "service",
             :mode => 0770,
             :desc => "Where the CA stores private certificate information."
         },
         :csrdir => { :default => "$cadir/requests",
             :owner => "service",
             :group => "service",
             :desc => "Where the CA stores certificate requests"
         },
         :signeddir => { :default => "$cadir/signed",
             :owner => "service",
             :group => "service",
             :mode => 0770,
             :desc => "Where the CA stores signed certificates."
         },
         :capass => { :default => "$caprivatedir/ca.pass",
             :owner => "service",
             :group => "service",
             :mode => 0660,
             :desc => "Where the CA stores the password for the private key"
         },
         :serial => { :default => "$cadir/serial",
             :owner => "service",
             :group => "service",
             :mode => 0644,
             :desc => "Where the serial number for certificates is stored."
         },
         :autosign => { :default => "$confdir/autosign.conf",
             :mode => 0644,
             :desc => "Whether to enable autosign.  Valid values are true (which
                 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.
                  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
                 's' (seconds). The unit defaults to seconds. If this parameter
                 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."],
         :keylength => [1024, "The bit length of keys."],
         :cert_inventory => {
             :default => "$cadir/inventory.txt",
             :mode => 0644,
             :owner => "service",
             :group => "service",
             :desc => "A Complete listing of all certificates"
         }
     )
 
     # Define the config default.
     setdefaults(Puppet.settings[:name],
         :config => ["$confdir/puppet.conf",
             "The configuration file for #{Puppet[:name]}."],
         :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 => {: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.",
             :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] == "" }
         }
     )
 
     setdefaults(:master,
         :user => ["puppet", "The user puppet master should run as."],
         :group => ["puppet", "The group puppet master should run as."],
         :manifestdir => ["$confdir/manifests",
             "Where puppet master looks for its manifests."],
         :manifest => ["$manifestdir/site.pp",
             "The entry-point manifest for puppet master."],
         :code => ["", "Code to parse directly.  This is essentially only used
             by ``puppet``, and should only be set if you're writing your own Puppet
             executable"],
         :masterlog => { :default => "$logdir/puppetmaster.log",
             :owner => "service",
             :group => "service",
             :mode => 0660,
             :desc => "Where puppet master logs.  This is generally not used,
                 since syslog is the default log destination."
         },
         :masterhttplog => { :default => "$logdir/masterhttp.log",
             :owner => "service",
             :group => "service",
             :mode => 0660,
             :create => true,
             :desc => "Where the puppet master web server logs."
         },
         :masterport => [8140, "Which port puppet master 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
            reported in its facts)"],
         :bucketdir => {
             :default => "$vardir/bucket",
             :mode => 0750,
             :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 ``puppet master``."
         ],
         :ca => [true, "Wether the master should function as a certificate authority."],
         :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.puppetlabs.com``).
             See http://projects.puppetlabs.com/projects/puppet/wiki/Using_Mongrel for more information."],
         :ssl_client_verify_header => ["HTTP_X_CLIENT_VERIFY", "The header containing the status
             message of the client verification. Only used with Mongrel.  This header must be set by the proxy
             to 'SUCCESS' if the client successfully authenticated, and anything else otherwise.
             See http://projects.puppetlabs.com/projects/puppet/wiki/Using_Mongrel 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 => "service", :group => "service", :mode => "750",
             :desc => "The directory in which YAML data is stored, usually in a subdirectory."},
         :server_datadir => {:default => "$vardir/server_data", :owner => "service", :group => "service", :mode => "750",
             :desc => "The directory in which serialized data is stored, usually in a subdirectory."},
         :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)."
         ],
         :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."]
     )
 
     setdefaults(:agent,
         :localconfig => { :default => "$statedir/localconfig",
             :owner => "root",
             :mode => 0660,
             :desc => "Where puppet agent caches the local configuration.  An
                 extension indicating the cache format is added automatically."},
         :statefile => { :default => "$statedir/state.yaml",
             :mode => 0660,
             :desc => "Where puppet agent and puppet master store state associated
                 with the running configuration.  In the case of puppet master,
                 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."},
         :client_datadir => {:default => "$vardir/client_data", :mode => "750",
             :desc => "The directory in which serialized data is stored on the client."},
         :classfile => { :default => "$statedir/classes.txt",
             :owner => "root",
             :mode => 0644,
             :desc => "The file in which puppet agent stores a list of the classes
                 associated with the retrieved configuration.  Can be loaded in
                 the separate ``puppet`` executable using the ``--loadclasses``
                 option."},
         :puppetdlog => { :default => "$logdir/puppetd.log",
             :owner => "root",
             :mode => 0640,
             :desc => "The log file for puppet agent.  This is generally not used."
         },
         :server => ["puppet",
             "The server to which server puppet agent should connect"],
         :ignoreschedules => [false,
             "Boolean; whether puppet agent should ignore schedules.  This is useful
             for initial puppet agent runs."],
         :puppetport => [8139, "Which port puppet agent listens on."],
         :noop => [false, "Whether puppet agent should be run in noop mode."],
         :runinterval => [1800, # 30 minutes
             "How often puppet agent applies the client configuration; in seconds."],
         :listen => [false, "Whether puppet agent should listen for
             connections.  If this is true, then by default only the
             ``runner`` server is started, which allows remote authorized
             and authenticated nodes to connect and trigger ``puppet agent``
             runs."],
         :ca_server => ["$server", "The server to use for certificate
             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 => {
             :default => "",
             :desc => "(Deprecated for 'preferred_serialization_format') 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.",
             :hook => proc { |value|
                 if value
                     Puppet.warning "Setting 'catalog_format' is deprecated; use 'preferred_serialization_format' instead."
                     Puppet.settings[:preferred_serialization_format] = value
                 end
             }
         },
         :preferred_serialization_format => ["pson", "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 puppet agent from doing anything."],
         :usecacheonfailure => [true,
             "Whether to use the cached configuration when the remote
             configuration will not compile.  This option is useful for testing
             new configurations, where you want to fix the broken configuration
             rather than reverting to a known-good one."
         ],
         :use_cached_catalog => [false,
             "Whether to only use the cached catalog rather than compiling a new catalog
             on every run.  Puppet can be run with this enabled by default and then selectively
             disabled when a recompile is desired."],
         :ignorecache => [false,
             "Ignore cache and always recompile the configuration.  This is
             useful for testing new configurations, where the local cache may in
             fact be stale even if the timestamps are up to date - if the facts
             change or if the server changes."
         ],
         :downcasefacts => [false,
             "Whether facts should be made all lowercase when sent to the server."],
         :dynamicfacts => ["memorysize,memoryfree,swapsize,swapfree",
             "Facts that are dynamic; these facts will be ignored when deciding whether
             changed facts should result in a recompile.  Multiple facts should be
             comma-separated."],
         :splaylimit => ["$runinterval",
             "The maximum time to delay before runs.  Defaults to being the same as the
             run interval."],
         :splay => [false,
             "Whether to sleep for a pseudo-random (but consistent) amount of time before
             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 => {
             :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."],
         :http_compression => [false, "Allow http compression in REST communication with the master.
             This setting might improve performance for agent -> master communications over slow WANs.
             Your puppetmaster needs to support compression (usually by activating some settings in a reverse-proxy
             in front of the puppetmaster, which rules out webrick). 
             It is harmless to activate this settings if your master doesn't support
             compression, but if it supports it, this setting might reduce performance on high-speed LANs."]
     )
 
     # Plugin information.
     setdefaults(:main,
         :plugindest => ["$libdir",
             "Where Puppet should store plugins that it pulls down from the central
             server."],
         :pluginsource => ["puppet://$server/plugins",
             "From where to retrieve plugins.  The standard Puppet ``file`` type
              is used for retrieval, so anything that is a valid file source can
              be used here."],
         :pluginsync => [false,
             "Whether plugins should be synced with the central server."],
         :pluginsignore => [".svn CVS .git",
             "What files to ignore when pulling down plugins."]
     )
 
     # Central fact information.
     setdefaults(:main,
         :factpath => {:default => "$vardir/lib/facter/${File::PATH_SEPARATOR}$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/",
             "Where Puppet should store facts that it pulls down from the central
             server."],
         :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."],
         :factsync => [false,
             "Whether facts should be synced with the central server."],
         :factsignore => [".svn CVS",
             "What files to ignore when pulling down facts."],
         :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."},
         :reporturl => ["http://localhost:3000/reports",
             "The URL used by the http reports processor to send reports"]
    )
 
     setdefaults(:tagmail,
         :tagmap => ["$confdir/tagmail.conf",
             "The mapping between reporting tags and email addresses."],
         :sendmail => [%x{which sendmail 2>/dev/null}.chomp,
             "Where to find the sendmail binary with which to send email."],
         :reportfrom => ["report@" + [Facter["hostname"].value, Facter["domain"].value].join("."),
             "The 'from' email address for the reports."],
         :smtpserver => ["none",
             "The server through which to send email reports."]
     )
 
     setdefaults(:rails,
         :dblocation => { :default => "$statedir/clientconfigs.sqlite3",
             :mode => 0660,
             :owner => "service",
             :group => "service",
             :desc => "The database cache for client configurations.  Used for
                 querying within the language."
         },
         :dbadapter => [ "sqlite3", "The type of database to use." ],
         :dbmigrate => [ false, "Whether to automatically migrate the database." ],
         :dbname => [ "puppet", "The name of the database to use." ],
         :dbserver => [ "localhost", "The database server for caching. Only
             used when networked databases are used."],
         :dbport => [ "", "The database password for caching. Only
             used when networked databases are used."],
         :dbuser => [ "puppet", "The database user for caching. Only
             used when networked databases are used."],
         :dbpassword => [ "puppet", "The database password for caching. Only
             used when networked databases are used."],
         :dbsocket => [ "", "The database socket location. Only used when networked
             databases are used.  Will be ignored if the value is an empty string."],
         :dbconnections => [ 0, "The number of database connections. Only used when
             networked databases are used.  Will be ignored if the value is an empty
             string or is less than 1."],
         :railslog => {:default => "$logdir/rails.log",
             :mode => 0600,
             :owner => "service",
             :group => "service",
             :desc => "Where Rails-specific logs are sent"
         },
         :rails_loglevel => ["info", "The log level for Rails connections.  The value must be
             a valid log level within Rails.  Production environments normally use ``info``
             and other environments normally use ``debug``."]
     )
 
     setdefaults(:couchdb,
         :couchdb_url => ["http://127.0.0.1:5984/puppet", "The url where the puppet couchdb database will be created"]
     )
 
     setdefaults(:transaction,
         :tags => ["", "Tags to use to find resources.  If this is set, then
             only resources tagged with the specified tags will be applied.
             Values must be comma-separated."],
         :evaltrace => [false, "Whether each resource should log when it is
             being evaluated.  This allows you to interactively see exactly
             what is being done."],
         :summarize => [false,
             "Whether to print a transaction summary."
         ]
     )
 
     setdefaults(:main,
         :external_nodes => ["none",
             "An external command that can produce node information.  The output
             must be a YAML dump of a hash, and that hash must have one or both of
             ``classes`` and ``parameters``, where ``classes`` is an array and
             ``parameters`` is a hash.  For unknown nodes, the commands should
             exit with a non-zero exit code.
 
             This command makes it straightforward to store your node mapping
             information in other data sources like databases."])
 
     setdefaults(:ldap,
         :ldapnodes => [false,
             "Whether to search for node configurations in LDAP.  See
             http://projects.puppetlabs.com/projects/puppet/wiki/LDAP_Nodes for more information."],
         :ldapssl => [false,
             "Whether SSL should be used when searching for nodes.
             Defaults to false because SSL usually requires certificates
             to be set up on the client side."],
         :ldaptls => [false,
             "Whether TLS should be used when searching for nodes.
             Defaults to false because TLS usually requires certificates
             to be set up on the client side."],
         :ldapserver => ["ldap",
             "The LDAP server.  Only used if ``ldapnodes`` is enabled."],
         :ldapport => [389,
             "The LDAP port.  Only used if ``ldapnodes`` is enabled."],
         :ldapstring => ["(&(objectclass=puppetClient)(cn=%s))",
             "The search string used to find an LDAP node."],
         :ldapclassattrs => ["puppetclass",
             "The LDAP attributes to use to define Puppet classes.  Values
             should be comma-separated."],
         :ldapstackedattrs => ["puppetvar",
             "The LDAP attributes that should be stacked to arrays by adding
             the values in all hierarchy elements of the tree.  Values
             should be comma-separated."],
         :ldapattrs => ["all",
             "The LDAP attributes to include when querying LDAP for nodes.  All
             returned attributes are set as variables in the top-level scope.
             Multiple values should be comma-separated.  The value 'all' returns
             all attributes."],
         :ldapparentattr => ["parentnode",
             "The attribute to use to define the parent node."],
         :ldapuser => ["",
             "The user to use to connect to LDAP.  Must be specified as a
             full DN."],
         :ldappassword => ["",
             "The password to use to connect to LDAP."],
         :ldapbase => ["",
             "The search base for LDAP searches.  It's impossible to provide
             a meaningful default here, although the LDAP libraries might
             have one already set.  Generally, it should be the 'ou=Hosts'
             branch under your main directory."]
     )
 
     setdefaults(:master,
         :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'
                 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.
     setdefaults(:parser,
         :lexical => [false, "Whether to use lexical scoping (vs. dynamic)."],
         :templatedir => ["$vardir/templates",
             "Where Puppet looks for template files.  Can be a list of colon-seperated
              directories."
         ]
     )
 end
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 3e2020c55..d1e1448cb 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -1,957 +1,957 @@
 require 'puppet'
 require 'sync'
 require 'getoptlong'
 require 'puppet/external/event-loop'
 require 'puppet/util/cacher'
 require 'puppet/util/loadedfile'
 
 # The class for handling configuration files.
 class Puppet::Util::Settings
     include Enumerable
     include Puppet::Util::Cacher
 
     require 'puppet/util/settings/setting'
     require 'puppet/util/settings/file_setting'
     require 'puppet/util/settings/boolean_setting'
 
     attr_accessor :file
     attr_reader :timer
 
     ReadOnly = [:run_mode, :name]
 
     # Retrieve a config value
     def [](param)
         value(param)
     end
 
     # Set a config value.  This doesn't set the defaults, it sets the value itself.
     def []=(param, value)
         set_value(param, value, :memory)
     end
 
     # Generate the list of valid arguments, in a format that GetoptLong can
     # understand, and add them to the passed option list.
     def addargs(options)
         # Add all of the config parameters as valid options.
         self.each { |name, setting|
             setting.getopt_args.each { |args| options << args }
         }
 
         return options
     end
 
     # Generate the list of valid arguments, in a format that OptionParser can
     # understand, and add them to the passed option list.
     def optparse_addargs(options)
         # Add all of the config parameters as valid options.
         self.each { |name, setting|
             options << setting.optparse_args
         }
 
         return options
     end
 
     # Is our parameter a boolean parameter?
     def boolean?(param)
         param = param.to_sym
         if @config.include?(param) and @config[param].kind_of? BooleanSetting
             return true
         else
             return false
         end
     end
 
     # Remove all set values, potentially skipping cli values.
     def clear(exceptcli = false)
         @sync.synchronize do
             unsafe_clear(exceptcli)
         end
     end
     
     # Remove all set values, potentially skipping cli values.
     def unsafe_clear(exceptcli = false)
         @values.each do |name, values|
             @values.delete(name) unless exceptcli and name == :cli
         end
 
         # Don't clear the 'used' in this case, since it's a config file reparse,
         # and we want to retain this info.
         unless exceptcli
             @used = []
         end
 
         @cache.clear
     end
 
     # This is mostly just used for testing.
     def clearused
         @cache.clear
         @used = []
     end
 
     # Do variable interpolation on the value.
     def convert(value, environment = nil)
         return value unless value
         return value unless value.is_a? String
         newval = value.gsub(/\$(\w+)|\$\{(\w+)\}/) do |value|
             varname = $2 || $1
             if varname == "environment" and environment
                 environment
             elsif pval = self.value(varname)
                 pval
             else
                 raise Puppet::DevError, "Could not find value for %s" % value
             end
         end
 
         return newval
     end
 
     # Return a value's description.
     def description(name)
         if obj = @config[name.to_sym]
             obj.desc
         else
             nil
         end
     end
 
     def each
         @config.each { |name, object|
             yield name, object
         }
     end
 
     # Iterate over each section name.
     def eachsection
         yielded = []
         @config.each do |name, object|
             section = object.section
             unless yielded.include? section
                 yield section
                 yielded << section
             end
         end
     end
 
     # Return an object by name.
     def setting(param)
         param = param.to_sym
         @config[param]
     end
 
     # Handle a command-line argument.
     def handlearg(opt, value = nil)
         @cache.clear
         value = munge_value(value) if value
         str = opt.sub(/^--/,'')
 
         bool = true
         newstr = str.sub(/^no-/, '')
         if newstr != str
             str = newstr
             bool = false
         end
         str = str.intern
 
         if @config[str].is_a?(Puppet::Util::Settings::BooleanSetting)
             if value == "" or value.nil?
                 value = bool
             end
         end
 
         set_value(str, value, :cli)
     end
 
     def without_noop
         old_noop = value(:noop,:cli) and set_value(:noop, false, :cli) if valid?(:noop)
         yield
     ensure
         set_value(:noop, old_noop, :cli) if valid?(:noop)
     end
 
     def include?(name)
         name = name.intern if name.is_a? String
         @config.include?(name)
     end
 
     # check to see if a short name is already defined
     def shortinclude?(short)
         short = short.intern if name.is_a? String
         @shortnames.include?(short)
     end
 
     # Create a new collection of config settings.
     def initialize
         @config = {}
         @shortnames = {}
 
         @created = []
         @searchpath = nil
 
         # Mutex-like thing to protect @values
         @sync = Sync.new
 
         # Keep track of set values.
         @values = Hash.new { |hash, key| hash[key] = {} }
 
         # And keep a per-environment cache
         @cache = Hash.new { |hash, key| hash[key] = {} }
 
         # The list of sections we've used.
         @used = []
     end
 
     # NOTE: ACS ahh the util classes. . .sigh
     # as part of a fix for 1183, I pulled the logic for the following 5 methods out of the executables and puppet.rb
     # They probably deserve their own class, but I don't want to do that until I can refactor environments
     # its a little better than where they were
 
     # Prints the contents of a config file with the available config settings, or it
     # prints a single value of a config setting.
     def print_config_options
         env = value(:environment)
         val = value(:configprint)
         if val == "all"
             hash = {}
             each do |name, obj|
                 val = value(name,env)
                 val = val.inspect if val == ""
                 hash[name] = val
             end
             hash.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, val|
                 puts "%s = %s" % [name, val]
             end
         else
             val.split(/\s*,\s*/).sort.each do |v|
                 if include?(v)
                     #if there is only one value, just print it for back compatibility
                     if v == val
                          puts value(val,env)
                          break
                     end
                     puts "%s = %s" % [v, value(v,env)]
                 else
                     puts "invalid parameter: %s" % v
                     return false
                 end
             end
         end
         true
     end
 
     def generate_config
         puts to_config
         true
     end
 
     def generate_manifest
         puts to_manifest
         true
     end
 
     def print_configs
         return print_config_options if value(:configprint) != ""
         return generate_config if value(:genconfig)
         return generate_manifest if value(:genmanifest)
     end
 
     def print_configs?
         return (value(:configprint) != "" || value(:genconfig) || value(:genmanifest)) && true
     end
 
     # Return a given object's file metadata.
     def metadata(param)
         if obj = @config[param.to_sym] and obj.is_a?(FileSetting)
             return [:owner, :group, :mode].inject({}) do |meta, p|
                 if v = obj.send(p)
                     meta[p] = v
                 end
                 meta
             end
         else
             nil
         end
     end
 
     # Make a directory with the appropriate user, group, and mode
     def mkdir(default)
         obj = get_config_file_default(default)
 
         Puppet::Util::SUIDManager.asuser(obj.owner, obj.group) do
             mode = obj.mode || 0750
             Dir.mkdir(obj.value, mode)
         end
     end
 
     # Figure out the section name for the run_mode.
     def run_mode
         Puppet.run_mode.name
     end
 
     # Return all of the parameters associated with a given section.
     def params(section = nil)
         if section
             section = section.intern if section.is_a? String
             @config.find_all { |name, obj|
                 obj.section == section
             }.collect { |name, obj|
                 name
             }
         else
             @config.keys
         end
     end
 
     # Parse the configuration file.  Just provides
     # thread safety.
     def parse
         raise "No :config setting defined; cannot parse unknown config file" unless self[:config]
 
         @sync.synchronize do
             unsafe_parse(self[:config])
         end
 
         # Create a timer so that this file will get checked automatically
         # and reparsed if necessary.
         set_filetimeout_timer()
     end
 
     # Unsafely parse the file -- this isn't thread-safe and causes plenty of problems if used directly.
     def unsafe_parse(file)
         return unless FileTest.exist?(file)
         begin
             data = parse_file(file)
         rescue => details
             puts details.backtrace if Puppet[:trace]
             Puppet.err "Could not parse #{file}: #{details}"
             return
         end
 
         unsafe_clear(true)
 
         metas = {}
         data.each do |area, values|
             metas[area] = values.delete(:_meta)
             values.each do |key,value|
                 set_value(key, value, area, :dont_trigger_handles => true, :ignore_bad_settings => true )
             end
         end
 
         # Determine our environment, if we have one.
         if @config[:environment]
             env = self.value(:environment).to_sym
         else
             env = "none"
         end
 
         # Call any hooks we should be calling.
         settings_with_hooks.each do |setting|
             each_source(env) do |source|
                 if value = @values[source][setting.name]
                     # We still have to use value() to retrieve the value, since
                     # we want the fully interpolated value, not $vardir/lib or whatever.
                     # This results in extra work, but so few of the settings
                     # will have associated hooks that it ends up being less work this
                     # way overall.
                     setting.handle(self.value(setting.name, env))
                     break
                 end
             end
         end
 
         # We have to do it in the reverse of the search path,
         # because multiple sections could set the same value
         # and I'm too lazy to only set the metadata once.
         searchpath.reverse.each do |source|
             if meta = metas[source]
                 set_metadata(meta)
             end
         end
     end
 
     # Create a new setting.  The value is passed in because it's used to determine
     # what kind of setting we're creating, but the value itself might be either
     # a default or a value, so we can't actually assign it.
     def newsetting(hash)
         klass = nil
         if hash[:section]
             hash[:section] = hash[:section].to_sym
         end
         if type = hash[:type]
             unless klass = {:setting => Setting, :file => FileSetting, :boolean => BooleanSetting}[type]
                 raise ArgumentError, "Invalid setting type '%s'" % type
             end
             hash.delete(:type)
         else
             case hash[:default]
             when true, false, "true", "false"
                 klass = BooleanSetting
             when /^\$\w+\//, /^\//, /^\w:\//
                 klass = FileSetting
             when String, Integer, Float # nothing
                 klass = Setting
             else
                 raise ArgumentError, "Invalid value '%s' for %s" % [hash[:default].inspect, hash[:name]]
             end
         end
         hash[:settings] = self
         setting = klass.new(hash)
 
         return setting
     end
 
     # This has to be private, because it doesn't add the settings to @config
     private :newsetting
 
     # Iterate across all of the objects in a given section.
     def persection(section)
         section = section.to_sym
         self.each { |name, obj|
             if obj.section == section
                 yield obj
             end
         }
     end
 
     # Cache this in an easily clearable way, since we were
     # having trouble cleaning it up after tests.
     cached_attr(:file) do
         if path = self[:config] and FileTest.exist?(path)
             Puppet::Util::LoadedFile.new(path)
         end
     end
 
     # Reparse our config file, if necessary.
     def reparse
         if file and file.changed?
             Puppet.notice "Reparsing %s" % file.file
             parse
             reuse()
         end
     end
 
     def reuse
         return unless defined? @used
         @sync.synchronize do # yay, thread-safe
             new = @used
             @used = []
             self.use(*new)
         end
     end
 
     # The order in which to search for values.
     def searchpath(environment = nil)
         if environment
-            [:cli, :memory, environment, :run_mode, :main]
+            [:cli, :memory, environment, :run_mode, :main, :mutable_defaults]
         else
-            [:cli, :memory, :run_mode, :main]
+            [:cli, :memory, :run_mode, :main, :mutable_defaults]
         end
     end
 
     # Get a list of objects per section
     def sectionlist
         sectionlist = []
         self.each { |name, obj|
             section = obj.section || "puppet"
             sections[section] ||= []
             unless sectionlist.include?(section)
                 sectionlist << section
             end
             sections[section] << obj
         }
 
         return sectionlist, sections
     end
 
     def service_user_available?
         return @service_user_available if defined?(@service_user_available)
 
         return @service_user_available = false unless user_name = self[:user]
 
         user = Puppet::Type.type(:user).new :name => self[:user], :audit => :ensure
 
         return @service_user_available = user.exists?
     end
 
     def set_value(param, value, type, options = {})
         param = param.to_sym
         unless setting = @config[param]
             if options[:ignore_bad_settings]
                 return
             else
                 raise ArgumentError,
                     "Attempt to assign a value to unknown configuration parameter %s" % param.inspect
             end
         end
         if setting.respond_to?(:munge)
             value = setting.munge(value)
         end
         if setting.respond_to?(:handle) and not options[:dont_trigger_handles]
             setting.handle(value)
         end
-        if ReadOnly.include? param
+        if ReadOnly.include? param and type != :mutable_defaults
             raise ArgumentError,
                 "You're attempting to set configuration parameter $#{param}, which is read-only."
         end
         require 'puppet/util/command_line'
         command_line = Puppet::Util::CommandLine.new
         legacy_to_mode = Puppet::Util::CommandLine::LegacyName.inject({}) do |hash, pair|
             app, legacy = pair
             command_line.require_application app
             hash[legacy.to_sym] = Puppet::Application.find(app).run_mode.name
             hash
         end
         if new_type = legacy_to_mode[type]
             Puppet.warning "You have configuration parameter $#{param} specified in [#{type}], which is a deprecated section. I'm assuming you meant [#{new_type}]"
             type = new_type
         end
         @sync.synchronize do # yay, thread-safe
             @values[type][param] = value
             @cache.clear
 
             clearused
 
             # Clear the list of environments, because they cache, at least, the module path.
             # We *could* preferentially just clear them if the modulepath is changed,
             # but we don't really know if, say, the vardir is changed and the modulepath
             # is defined relative to it. We need the defined? stuff because of loading
             # order issues.
             Puppet::Node::Environment.clear if defined?(Puppet::Node) and defined?(Puppet::Node::Environment)
         end
 
         return value
     end
 
     # Set a bunch of defaults in a given section.  The sections are actually pretty
     # pointless, but they help break things up a bit, anyway.
     def setdefaults(section, defs)
         section = section.to_sym
         call = []
         defs.each { |name, hash|
             if hash.is_a? Array
                 unless hash.length == 2
                     raise ArgumentError, "Defaults specified as an array must contain only the default value and the decription"
                 end
                 tmp = hash
                 hash = {}
                 [:default, :desc].zip(tmp).each { |p,v| hash[p] = v }
             end
             name = name.to_sym
             hash[:name] = name
             hash[:section] = section
             if @config.include?(name)
                 raise ArgumentError, "Parameter %s is already defined" % name
             end
             tryconfig = newsetting(hash)
             if short = tryconfig.short
                 if other = @shortnames[short]
                     raise ArgumentError, "Parameter %s is already using short name '%s'" % [other.name, short]
                 end
                 @shortnames[short] = tryconfig
             end
             @config[name] = tryconfig
 
             # Collect the settings that need to have their hooks called immediately.
             # We have to collect them so that we can be sure we're fully initialized before
             # the hook is called.
             call << tryconfig if tryconfig.call_on_define
         }
 
         call.each { |setting| setting.handle(self.value(setting.name)) }
     end
 
     # Create a timer to check whether the file should be reparsed.
     def set_filetimeout_timer
         return unless timeout = self[:filetimeout] and timeout = Integer(timeout) and timeout > 0
         timer = EventLoop::Timer.new(:interval => timeout, :tolerance => 1, :start? => true) { self.reparse() }
     end
 
     # Convert the settings we manage into a catalog full of resources that model those settings.
     def to_catalog(*sections)
         sections = nil if sections.empty?
 
         catalog = Puppet::Resource::Catalog.new("Settings")
 
         @config.values.find_all { |value| value.is_a?(FileSetting) }.each do |file|
             next unless (sections.nil? or sections.include?(file.section))
             next unless resource = file.to_resource
             next if catalog.resource(resource.ref)
 
             catalog.add_resource(resource)
         end
 
         add_user_resources(catalog, sections)
 
         catalog
     end
 
     # Convert our list of config settings into a configuration file.
     def to_config
         str = %{The configuration file for #{Puppet[:name]}.  Note that this file
 is likely to have unused configuration parameters in it; any parameter that's
 valid anywhere in Puppet can be in any config file, even if it's not used.
 
 Every section can specify three special parameters: owner, group, and mode.
 These parameters affect the required permissions of any files specified after
 their specification.  Puppet will sometimes use these parameters to check its
 own configured state, so they can be used to make Puppet a bit more self-managing.
 
 Generated on #{Time.now}.
 
 }.gsub(/^/, "# ")
 
         # Add a section heading that matches our name.
         if @config.include?(:run_mode)
             str += "[%s]\n" % self[:run_mode]
         end
         eachsection do |section|
             persection(section) do |obj|
                 str += obj.to_config + "\n" unless ReadOnly.include? obj.name
             end
         end
 
         return str
     end
 
     # Convert to a parseable manifest
     def to_manifest
         catalog = to_catalog
         catalog.resource_refs.collect do |ref|
             catalog.resource(ref).to_manifest
         end.join("\n\n")
     end
 
     # Create the necessary objects to use a section.  This is idempotent;
     # you can 'use' a section as many times as you want.
     def use(*sections)
         sections = sections.collect { |s| s.to_sym }
         @sync.synchronize do # yay, thread-safe
             sections = sections.reject { |s| @used.include?(s) }
 
             return if sections.empty?
 
             begin
                 catalog = to_catalog(*sections).to_ral
             rescue => detail
                 puts detail.backtrace if Puppet[:trace]
                 Puppet.err "Could not create resources for managing Puppet's files and directories in sections %s: %s" % [sections.inspect, detail]
 
                 # We need some way to get rid of any resources created during the catalog creation
                 # but not cleaned up.
                 return
             end
 
             without_noop do
                 catalog.host_config = false
                 catalog.apply do |transaction|
                     if transaction.any_failed?
                         report = transaction.report
                         failures = report.logs.find_all { |log| log.level == :err }
                         raise "Got %s failure(s) while initializing: %s" % [failures.length, failures.collect { |l| l.to_s }.join("; ")]
                     end
                 end
             end
 
             sections.each { |s| @used << s }
             @used.uniq!
         end
     end
 
     def valid?(param)
         param = param.to_sym
         @config.has_key?(param)
     end
 
     def uninterpolated_value(param, environment = nil)
         param = param.to_sym
         environment = environment.to_sym if environment
 
         # See if we can find it within our searchable list of values
         val = catch :foundval do
             each_source(environment) do |source|
                 # Look for the value.  We have to test the hash for whether
                 # it exists, because the value might be false.
                 @sync.synchronize do
                     if @values[source].include?(param)
                         throw :foundval, @values[source][param]
                     end
                 end
             end
             throw :foundval, nil
         end
         
         # If we didn't get a value, use the default
         val = @config[param].default if val.nil?
 
         return val
     end
 
     # Find the correct value using our search path.  Optionally accept an environment
     # in which to search before the other configuration sections.
     def value(param, environment = nil)
         param = param.to_sym
         environment = environment.to_sym if environment
 
         # Short circuit to nil for undefined parameters.
         return nil unless @config.include?(param)
 
         # Yay, recursion.
         #self.reparse() unless [:config, :filetimeout].include?(param)
 
         # Check the cache first.  It needs to be a per-environment
         # cache so that we don't spread values from one env
         # to another.
         if cached = @cache[environment||"none"][param]
             return cached
         end
 
         val = uninterpolated_value(param, environment)
 
         # Convert it if necessary
         val = convert(val, environment)
 
         # And cache it
         @cache[environment||"none"][param] = val
         return val
     end
 
     # Open a file with the appropriate user, group, and mode
     def write(default, *args, &bloc)
         obj = get_config_file_default(default)
         writesub(default, value(obj.name), *args, &bloc)
     end
 
     # Open a non-default file under a default dir with the appropriate user,
     # group, and mode
     def writesub(default, file, *args, &bloc)
         obj = get_config_file_default(default)
         chown = nil
         if Puppet.features.root?
             chown = [obj.owner, obj.group]
         else
             chown = [nil, nil]
         end
 
         Puppet::Util::SUIDManager.asuser(*chown) do
             mode = obj.mode || 0640
             if args.empty?
                 args << "w"
             end
 
             args << mode
 
             # Update the umask to make non-executable files
             Puppet::Util.withumask(File.umask ^ 0111) do
                 File.open(file, *args) do |file|
                     yield file
                 end
             end
         end
     end
 
     def readwritelock(default, *args, &bloc)
         file = value(get_config_file_default(default).name)
         tmpfile = file + ".tmp"
         sync = Sync.new
         unless FileTest.directory?(File.dirname(tmpfile))
             raise Puppet::DevError, "Cannot create %s; directory %s does not exist" %
                 [file, File.dirname(file)]
         end
 
         sync.synchronize(Sync::EX) do
             File.open(file, ::File::CREAT|::File::RDWR, 0600) do |rf|
                 rf.lock_exclusive do
                     if File.exist?(tmpfile)
                         raise Puppet::Error, ".tmp file already exists for %s; Aborting locked write. Check the .tmp file and delete if appropriate" %
                             [file]
                     end
 
                     # If there's a failure, remove our tmpfile
                     begin
                         writesub(default, tmpfile, *args, &bloc)
                     rescue
                         File.unlink(tmpfile) if FileTest.exist?(tmpfile)
                         raise
                     end
 
                     begin
                         File.rename(tmpfile, file)
                     rescue => detail
                         Puppet.err "Could not rename %s to %s: %s" % [file, tmpfile, detail]
                         File.unlink(tmpfile) if FileTest.exist?(tmpfile)
                     end
                 end
             end
         end
     end
 
     private
 
     def get_config_file_default(default)
         obj = nil
         unless obj = @config[default]
             raise ArgumentError, "Unknown default %s" % default
         end
 
         unless obj.is_a? FileSetting
             raise ArgumentError, "Default %s is not a file" % default
         end
 
         return obj
     end
 
     # Create the transportable objects for users and groups.
     def add_user_resources(catalog, sections)
         return unless Puppet.features.root?
         return unless self[:mkusers]
 
         @config.each do |name, setting|
             next unless setting.respond_to?(:owner)
             next unless sections.nil? or sections.include?(setting.section)
 
             if user = setting.owner and user != "root" and catalog.resource(:user, user).nil?
                 resource = Puppet::Resource.new(:user, user, :parameters => {:ensure => :present})
                 if self[:group]
                     resource[:gid] = self[:group]
                 end
                 catalog.add_resource resource
             end
             if group = setting.group and ! %w{root wheel}.include?(group) and catalog.resource(:group, group).nil?
                 catalog.add_resource Puppet::Resource.new(:group, group, :parameters => {:ensure => :present})
             end
         end
     end
 
     # Yield each search source in turn.
     def each_source(environment)
         searchpath(environment).each do |source|
             # Modify the source as necessary.
             source = self.run_mode if source == :run_mode
             yield source
         end
     end
 
     # Return all settings that have associated hooks; this is so
     # we can call them after parsing the configuration file.
     def settings_with_hooks
         @config.values.find_all { |setting| setting.respond_to?(:handle) }
     end
 
     # Extract extra setting information for files.
     def extract_fileinfo(string)
         result = {}
         value = string.sub(/\{\s*([^}]+)\s*\}/) do
             params = $1
             params.split(/\s*,\s*/).each do |str|
                 if str =~ /^\s*(\w+)\s*=\s*([\w\d]+)\s*$/
                     param, value = $1.intern, $2
                     result[param] = value
                     unless [:owner, :mode, :group].include?(param)
                         raise ArgumentError, "Invalid file option '%s'" % param
                     end
 
                     if param == :mode and value !~ /^\d+$/
                         raise ArgumentError, "File modes must be numbers"
                     end
                 else
                     raise ArgumentError, "Could not parse '%s'" % string
                 end
             end
             ''
         end
         result[:value] = value.sub(/\s*$/, '')
         return result
     end
 
     # Convert arguments into booleans, integers, or whatever.
     def munge_value(value)
         # Handle different data types correctly
         return case value
             when /^false$/i; false
             when /^true$/i; true
             when /^\d+$/i; Integer(value)
             when true; true
             when false; false
             else
                 value.gsub(/^["']|["']$/,'').sub(/\s+$/, '')
         end
     end
 
     # This method just turns a file in to a hash of hashes.
     def parse_file(file)
         text = read_file(file)
 
         result = Hash.new { |names, name|
             names[name] = {}
         }
 
         count = 0
 
         # Default to 'main' for the section.
         section = :main
         result[section][:_meta] = {}
         text.split(/\n/).each { |line|
             count += 1
             case line
             when /^\s*\[(\w+)\]\s*$/
                 section = $1.intern # Section names
                 # Add a meta section
                 result[section][:_meta] ||= {}
             when /^\s*#/; next # Skip comments
             when /^\s*$/; next # Skip blanks
             when /^\s*(\w+)\s*=\s*(.*?)\s*$/ # settings
                 var = $1.intern
 
                 # We don't want to munge modes, because they're specified in octal, so we'll
                 # just leave them as a String, since Puppet handles that case correctly.
                 if var == :mode
                     value = $2
                 else
                     value = munge_value($2)
                 end
 
                 # Check to see if this is a file argument and it has extra options
                 begin
                     if value.is_a?(String) and options = extract_fileinfo(value)
                         value = options[:value]
                         options.delete(:value)
                         result[section][:_meta][var] = options
                     end
                     result[section][var] = value
                 rescue Puppet::Error => detail
                     detail.file = file
                     detail.line = line
                     raise
                 end
             else
                 error = Puppet::Error.new("Could not match line %s" % line)
                 error.file = file
                 error.line = line
                 raise error
             end
         }
 
         return result
     end
 
     # Read the file in.
     def read_file(file)
         begin
             return File.read(file)
         rescue Errno::ENOENT
             raise ArgumentError, "No such file %s" % file
         rescue Errno::EACCES
             raise ArgumentError, "Permission denied to file %s" % file
         end
     end
 
     # Set file metadata.
     def set_metadata(meta)
         meta.each do |var, values|
             values.each do |param, value|
                 @config[var].send(param.to_s + "=", value)
             end
         end
     end
 end