diff --git a/acceptance/tests/pluginsync/7316_apps_should_be_available_via_pluginsync.rb b/acceptance/tests/pluginsync/7316_apps_should_be_available_via_pluginsync.rb
index 01768109c..3624ac8f2 100644
--- a/acceptance/tests/pluginsync/7316_apps_should_be_available_via_pluginsync.rb
+++ b/acceptance/tests/pluginsync/7316_apps_should_be_available_via_pluginsync.rb
@@ -1,237 +1,237 @@
 test_name "the pluginsync functionality should sync app definitions, and they should be runnable afterwards"
 
 #
 # This test is intended to ensure that pluginsync syncs app definitions to the agents.
 # Further, the apps should be runnable on the agent after the sync has occurred.
 #
 
 ###############################################################################
 # BEGIN UTILITY METHODS - ideally this stuff would live somewhere besides in
 #  the actual test.
 ###############################################################################
 
 # Create a file on the host.
 # Parameters:
 # [host] the host to create the file on
 # [file_path] the path to the file to be created
 # [file_content] a string containing the contents to be written to the file
 # [options] a hash containing additional behavior options.  Currently supported:
 # * :mkdirs (default false) if true, attempt to create the parent directories on the remote host before writing
 #       the file
 # * :owner (default 'root') the username of the user that the file should be owned by
 # * :group (default 'puppet') the name of the group that the file should be owned by
 # * :mode (default '644') the mode (file permissions) that the file should be created with
 def create_test_file(host, file_rel_path, file_content, options)
 
   # set default options
   options[:mkdirs] ||= false
   options[:owner] ||= "root"
   options[:group] ||= "puppet"
   options[:mode] ||= "755"
 
   file_path = get_test_file_path(host, file_rel_path)
 
   mkdirs(host, File.dirname(file_path)) if (options[:mkdirs] == true)
   create_remote_file(host, file_path, file_content)
 
 #
 # NOTE: we need these chown/chmod calls because the acceptance framework connects to the nodes as "root", but
 #  puppet 'master' runs as user 'puppet'.  Therefore, in order for puppet master to be able to read any files
 #  that we've created, we have to carefully set their permissions
 #
 
   chown(host, options[:owner], options[:group], file_path)
   chmod(host, options[:mode], file_path)
 
 end
 
 
 # Given a relative path, returns an absolute path for a test file.  Basically, this just prepends the
 # a unique temp dir path (specific to the current test execution) to your relative path.
 def get_test_file_path(host, file_rel_path)
   File.join(@host_test_tmp_dirs[host.name], file_rel_path)
 end
 
 
 # Check for the existence of a temp file for the current test; basically, this just calls file_exists?(),
 # but prepends the path to the current test's temp dir onto the file_rel_path parameter.  This allows
 # tests to be written using only a relative path to specify file locations, while still taking advantage
 # of automatic temp file cleanup at test completion.
 def test_file_exists?(host, file_rel_path)
   host.execute("test -f \"#{get_test_file_path(host, file_rel_path)}\"",
                :acceptable_exit_codes => [0, 1])  do |result|
     return result.exit_code == 0
   end
 end
 
 def tmpdir(host, basename)
   host_tmpdir = host.tmpdir(basename)
   # we need to make sure that the puppet user can traverse this directory...
   chmod(host, "755", host_tmpdir)
   host_tmpdir
 end
 
 def mkdirs(host, dir_path)
   on(host, "mkdir -p #{dir_path}")
 end
 
 def chown(host, owner, group, path)
   on(host, "chown #{owner}:#{group} #{path}")
 end
 
 def chmod(host, mode, path)
   on(host, "chmod #{mode} #{path}")
 end
 
 
 
 
 # pluck this out of the test case environment; not sure if there is a better way
 cur_test_file = @path
 cur_test_file_shortname = File.basename(cur_test_file, File.extname(cur_test_file))
 
 # we need one list of all of the hosts, to assist in managing temp dirs.  It's possible
 # that the master is also an agent, so this will consolidate them into a unique set
 all_hosts = Set[master, *agents]
 
 # now we can create a hash of temp dirs--one per host, and unique to this test--without worrying about
 # doing it twice on any individual host
 @host_test_tmp_dirs = Hash[all_hosts.map do |host| [host.name, tmpdir(host, cur_test_file_shortname)] end ]
 
 # a silly variable for keeping track of whether or not all of the tests passed...
 all_tests_passed = false
 
 ###############################################################################
 # END UTILITY METHODS
 ###############################################################################
 
 
 
 ###############################################################################
 # BEGIN TEST LOGIC
 ###############################################################################
 
 # create some vars to point to the directories that we're going to point the master/agents at
 master_module_dir = "master_modules"
 agent_lib_dir = "agent_lib"
 
 app_name = "superbogus"
 app_desc = "a simple %1$s for testing %1$s delivery via plugin sync"
 app_output = "Hello from the #{app_name} %s"
 
 master_module_file_content = {}
 
 master_module_file_content["application"] = <<-HERE
 require 'puppet/application'
 
 class Puppet::Application::#{app_name.capitalize} < Puppet::Application
 
   def help
     <<-HELP
 
 puppet-#{app_name}(8) -- #{app_desc % "application"}
 ========
     HELP
   end
 
   def main()
     puts("#{app_output % "application"}")
   end
 end
 HERE
 
 
 # this begin block is here for handling temp file cleanup via an "ensure" block at the very end of the
 # test.
 begin
 
   modes = ["application"]
 
   modes.each do |mode|
 
     # here we create a custom app, which basically doesn't do anything except for print a hello-world message
     agent_module_app_file = "#{agent_lib_dir}/puppet/#{mode}/#{app_name}.rb"
     master_module_app_file = "#{master_module_dir}/#{app_name}/lib/puppet/#{mode}/#{app_name}.rb"
 
 
     # copy all the files to the master
     step "write our simple module out to the master" do
       create_test_file(master, master_module_app_file, master_module_file_content[mode], :mkdirs => true)
     end
 
     step "verify that the app file exists on the master" do
       unless test_file_exists?(master, master_module_app_file) then
         fail_test("Failed to create app file '#{get_test_file_path(master, master_module_app_file)}' on master")
       end
     end
 
     step "start the master" do
       with_master_running_on(master,
              "--modulepath=\"#{get_test_file_path(master, master_module_dir)}\" " +
              "--autosign true") do
 
         # the module files shouldn't exist on the agent yet because they haven't been synced
         step "verify that the module files don't exist on the agent path" do
           agents.each do |agent|
               if test_file_exists?(agent, agent_module_app_file) then
                 fail_test("app file already exists on agent: '#{get_test_file_path(agent, agent_module_app_file)}'")
               end
           end
         end
 
         step "run the agent" do
           agents.each do |agent|
             run_agent_on(agent, "--trace --libdir=\"#{get_test_file_path(agent, agent_lib_dir)}\" " +
                                 "--no-daemonize --verbose --onetime --test --server #{master}")
           end
         end
 
       end
     end
 
     step "verify that the module files were synced down to the agent" do
       agents.each do |agent|
         unless test_file_exists?(agent, agent_module_app_file) then
           fail_test("Expected app file not synced to agent: '#{get_test_file_path(agent, agent_module_app_file)}'")
         end
       end
     end
 
     step "verify that the application shows up in help" do
       agents.each do |agent|
         on(agent, PuppetCommand.new(:help, "--libdir=\"#{get_test_file_path(agent, agent_lib_dir)}\"")) do
           assert_match(/^\s+#{app_name}\s+#{app_desc % mode}$/, result.stdout)
         end
       end
     end
 
     step "verify that we can run the application" do
       agents.each do |agent|
         on(agent, PuppetCommand.new(:"#{app_name}", "--libdir=\"#{get_test_file_path(agent, agent_lib_dir)}\"")) do
           assert_match(/^#{app_output % mode}$/, result.stdout)
         end
       end
     end
 
     step "clear out the libdir on the agents in preparation for the next test" do
       agents.each do |agent|
-        on(agent, "rm -rf #{get_test_file_path(agent, agent_module_app_file)}/*")
+        on(agent, "rm -rf #{get_test_file_path(agent, agent_lib_dir)}/*")
       end
     end
 
   end
 
   all_tests_passed = true
 
 ensure
   ##########################################################################################
   # Clean up all of the temp files created by this test.  It would be nice if this logic
   # could be handled outside of the test itself; I envision a stanza like this one appearing
   # in a very large number of the tests going forward unless it is handled by the framework.
   ##########################################################################################
   if all_tests_passed then
     all_hosts.each do |host|
       on(host, "rm -rf #{@host_test_tmp_dirs[host.name]}")
     end
   end
 end
\ No newline at end of file
diff --git a/acceptance/tests/pluginsync/7316_faces_with_app_stubs_should_be_available_via_pluginsync.rb b/acceptance/tests/pluginsync/7316_faces_with_app_stubs_should_be_available_via_pluginsync.rb
index f0f7769de..5b559b318 100644
--- a/acceptance/tests/pluginsync/7316_faces_with_app_stubs_should_be_available_via_pluginsync.rb
+++ b/acceptance/tests/pluginsync/7316_faces_with_app_stubs_should_be_available_via_pluginsync.rb
@@ -1,259 +1,258 @@
 test_name "the pluginsync functionality should sync app definitions, and they should be runnable afterwards"
 
 #
 # This test is intended to ensure that pluginsync syncs face definitions to the agents.
 # Further, the face should be runnable on the agent after the sync has occurred.
 #
 # (NOTE: When this test is passing, it should resolve both #7316 re: verifying that apps/faces can
 #  be run on the agent node after a plugin sync, and #6753 re: being able to run a face without
 #  having a placeholder stub file in the "applications" directory.)
 #
 
 ###############################################################################
 # BEGIN UTILITY METHODS - ideally this stuff would live somewhere besides in
 #  the actual test.
 ###############################################################################
 
 # Create a file on the host.
 # Parameters:
 # [host] the host to create the file on
 # [file_path] the path to the file to be created
 # [file_content] a string containing the contents to be written to the file
 # [options] a hash containing additional behavior options.  Currently supported:
 # * :mkdirs (default false) if true, attempt to create the parent directories on the remote host before writing
 #       the file
 # * :owner (default 'root') the username of the user that the file should be owned by
 # * :group (default 'puppet') the name of the group that the file should be owned by
 # * :mode (default '644') the mode (file permissions) that the file should be created with
 def create_test_file(host, file_rel_path, file_content, options)
 
   # set default options
   options[:mkdirs] ||= false
   options[:owner] ||= "root"
   options[:group] ||= "puppet"
   options[:mode] ||= "755"
 
   file_path = get_test_file_path(host, file_rel_path)
 
   mkdirs(host, File.dirname(file_path)) if (options[:mkdirs] == true)
   create_remote_file(host, file_path, file_content)
 
 #
 # NOTE: we need these chown/chmod calls because the acceptance framework connects to the nodes as "root", but
 #  puppet 'master' runs as user 'puppet'.  Therefore, in order for puppet master to be able to read any files
 #  that we've created, we have to carefully set their permissions
 #
 
   chown(host, options[:owner], options[:group], file_path)
   chmod(host, options[:mode], file_path)
 
 end
 
 
 # Given a relative path, returns an absolute path for a test file.  Basically, this just prepends the
 # a unique temp dir path (specific to the current test execution) to your relative path.
 def get_test_file_path(host, file_rel_path)
   File.join(@host_test_tmp_dirs[host.name], file_rel_path)
 end
 
 
 # Check for the existence of a temp file for the current test; basically, this just calls file_exists?(),
 # but prepends the path to the current test's temp dir onto the file_rel_path parameter.  This allows
 # tests to be written using only a relative path to specify file locations, while still taking advantage
 # of automatic temp file cleanup at test completion.
 def test_file_exists?(host, file_rel_path)
   host.execute("test -f \"#{get_test_file_path(host, file_rel_path)}\"",
                :acceptable_exit_codes => [0, 1])  do |result|
     return result.exit_code == 0
   end
 end
 
 def tmpdir(host, basename)
   host_tmpdir = host.tmpdir(basename)
   # we need to make sure that the puppet user can traverse this directory...
   chmod(host, "755", host_tmpdir)
   host_tmpdir
 end
 
 def mkdirs(host, dir_path)
   on(host, "mkdir -p #{dir_path}")
 end
 
 def chown(host, owner, group, path)
   on(host, "chown #{owner}:#{group} #{path}")
 end
 
 def chmod(host, mode, path)
   on(host, "chmod #{mode} #{path}")
 end
 
 
 
 
 # pluck this out of the test case environment; not sure if there is a better way
 cur_test_file = @path
 cur_test_file_shortname = File.basename(cur_test_file, File.extname(cur_test_file))
 
 # we need one list of all of the hosts, to assist in managing temp dirs.  It's possible
 # that the master is also an agent, so this will consolidate them into a unique set
 all_hosts = Set[master, *agents]
 
 # now we can create a hash of temp dirs--one per host, and unique to this test--without worrying about
 # doing it twice on any individual host
 @host_test_tmp_dirs = Hash[all_hosts.map do |host| [host.name, tmpdir(host, cur_test_file_shortname)] end ]
 
 # a silly variable for keeping track of whether or not all of the tests passed...
 all_tests_passed = false
 
 ###############################################################################
 # END UTILITY METHODS
 ###############################################################################
 
 
 
 ###############################################################################
 # BEGIN TEST LOGIC
 ###############################################################################
 
 # create some vars to point to the directories that we're going to point the master/agents at
 master_module_dir = "master_modules"
 agent_lib_dir = "agent_lib"
 
 app_name = "superbogus"
 app_desc = "a simple %1$s for testing %1$s delivery via plugin sync"
 app_output = "Hello from the #{app_name} %s"
 
 master_module_file_content = {}
 
 
 master_module_face_content = <<-HERE
 Puppet::Face.define(:#{app_name}, '0.0.1') do
   copyright "Puppet Labs", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "#{app_desc % "face"}"
 
   action(:foo) do
     summary "a test action defined in the test face in the main puppet lib dir"
 
     default
     when_invoked do |*args|
       puts "#{app_output % "face"}"
     end
   end
 
 end
 HERE
 
 master_module_app_content = <<-HERE
 require 'puppet/application/face_base'
 
 class Puppet::Application::#{app_name.capitalize} < Puppet::Application::FaceBase
 end
 
 HERE
 
 
 
 # this begin block is here for handling temp file cleanup via an "ensure" block at the very end of the
 # test.
 begin
 
   # here we create a custom app, which basically doesn't do anything except for print a hello-world message
   agent_module_face_file = "#{agent_lib_dir}/puppet/face/#{app_name}.rb"
   master_module_face_file = "#{master_module_dir}/#{app_name}/lib/puppet/face/#{app_name}.rb"
 
   agent_module_app_file = "#{agent_lib_dir}/puppet/application/#{app_name}.rb"
   master_module_app_file = "#{master_module_dir}/#{app_name}/lib/puppet/application/#{app_name}.rb"
 
 
   # copy all the files to the master
   step "write our simple module out to the master" do
     create_test_file(master, master_module_app_file, master_module_app_content, :mkdirs => true)
     create_test_file(master, master_module_face_file, master_module_face_content, :mkdirs => true)
   end
 
   step "verify that the app file exists on the master" do
     unless test_file_exists?(master, master_module_app_file) then
       fail_test("Failed to create app file '#{get_test_file_path(master, master_module_app_file)}' on master")
     end
     unless test_file_exists?(master, master_module_face_file) then
       fail_test("Failed to create face file '#{get_test_file_path(master, master_module_face_file)}' on master")
     end
   end
 
   step "start the master" do
     with_master_running_on(master,
            "--modulepath=\"#{get_test_file_path(master, master_module_dir)}\" " +
            "--autosign true") do
 
       # the module files shouldn't exist on the agent yet because they haven't been synced
       step "verify that the module files don't exist on the agent path" do
         agents.each do |agent|
             if test_file_exists?(agent, agent_module_app_file) then
               fail_test("app file already exists on agent: '#{get_test_file_path(agent, agent_module_app_file)}'")
             end
             if test_file_exists?(agent, agent_module_app_file) then
               fail_test("face file already exists on agent: '#{get_test_file_path(agent, agent_module_face_file)}'")
             end
         end
       end
 
       step "run the agent" do
         agents.each do |agent|
           run_agent_on(agent, "--trace --libdir=\"#{get_test_file_path(agent, agent_lib_dir)}\" " +
                               "--no-daemonize --verbose --onetime --test --server #{master}")
         end
       end
 
     end
   end
 
   step "verify that the module files were synced down to the agent" do
     agents.each do |agent|
       unless test_file_exists?(agent, agent_module_app_file) then
         fail_test("Expected app file not synced to agent: '#{get_test_file_path(agent, agent_module_app_file)}'")
       end
       unless test_file_exists?(agent, agent_module_face_file) then
         fail_test("Expected face file not synced to agent: '#{get_test_file_path(agent, agent_module_face_file)}'")
       end
     end
   end
 
   step "verify that the application shows up in help" do
     agents.each do |agent|
       on(agent, PuppetCommand.new(:help, "--libdir=\"#{get_test_file_path(agent, agent_lib_dir)}\"")) do
         assert_match(/^\s+#{app_name}\s+#{app_desc % "face"}$/, result.stdout)
       end
     end
   end
 
   step "verify that we can run the application" do
     agents.each do |agent|
       on(agent, PuppetCommand.new(:"#{app_name}", "--libdir=\"#{get_test_file_path(agent, agent_lib_dir)}\"")) do
         assert_match(/^#{app_output % "face"}$/, result.stdout)
       end
     end
   end
 
   step "clear out the libdir on the agents in preparation for the next test" do
     agents.each do |agent|
-      on(agent, "rm -rf #{get_test_file_path(agent, agent_module_app_file)}/*")
-      on(agent, "rm -rf #{get_test_file_path(agent, agent_module_face_file)}/*")
+      on(agent, "rm -rf #{get_test_file_path(agent, agent_lib_dir)}/*")
     end
   end
 
   all_tests_passed = true
 
 ensure
   ##########################################################################################
   # Clean up all of the temp files created by this test.  It would be nice if this logic
   # could be handled outside of the test itself; I envision a stanza like this one appearing
   # in a very large number of the tests going forward unless it is handled by the framework.
   ##########################################################################################
   if all_tests_passed then
     all_hosts.each do |host|
       on(host, "rm -rf #{@host_test_tmp_dirs[host.name]}")
     end
   end
 end
\ No newline at end of file
diff --git a/acceptance/tests/ticket_6928_puppet_master_parse_fails.rb b/acceptance/tests/ticket_6928_puppet_master_parse_fails.rb
index 039390cca..7141bdc04 100644
--- a/acceptance/tests/ticket_6928_puppet_master_parse_fails.rb
+++ b/acceptance/tests/ticket_6928_puppet_master_parse_fails.rb
@@ -1,32 +1,32 @@
 test_name "#6928: Puppet --parseonly should return deprication message"
 
 # Create good and bad formatted manifests
 step "Master: create valid, invalid formatted manifests"
 create_remote_file(master, '/tmp/good.pp', %w{notify{good:}} )
 create_remote_file(master, '/tmp/bad.pp', 'notify{bad:')
 
 step "Master: use --parseonly on an invalid manifest, should return 1 and issue deprecation warning"
 on master, puppet_master( %w{--parseonly /tmp/bad.pp} ), :acceptable_exit_codes => [ 1 ]
   assert_match(/--parseonly has been removed. Please use \'puppet parser validate <manifest>\'/, stdout, "Deprecation warning not issued for --parseonly on #{master}" )
 
 step "Agents: create valid, invalid formatted manifests"
 agents.each do |host|
   good = host.tmpfile('good-6928')
   bad = host.tmpfile('bad-6928')
 
   create_remote_file(host, good, %w{notify{good:}} )
   create_remote_file(host, bad, 'notify{bad:')
 
   step "Agents: use --parseonly on an invalid manifest, should return 1 and issue deprecation warning"
-  on(host, puppet('--parseonly', bad), :acceptable_exit_codes => [ 1 ]) do
+  on(host, puppet('apply', '--parseonly', bad), :acceptable_exit_codes => [ 1 ]) do
     assert_match(/--parseonly has been removed. Please use \'puppet parser validate <manifest>\'/, stdout, "Deprecation warning not issued for --parseonly on #{host}" )
   end
 
   step "Test Face for 'parser validate' with good manifest -- should pass"
   on(host, puppet('parser', 'validate', good), :acceptable_exit_codes => [ 0 ])
 
   step "Test Faces for 'parser validate' with bad manifest -- should fail"
   on(host, puppet('parser', 'validate', bad), :acceptable_exit_codes => [ 1 ]) do
     assert_match(/err: Could not parse for environment production/, stdout, "Bad manifest detection failed on #{host}" )
   end
 end
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index b97f2c361..fd6269eb7 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -1,195 +1,213 @@
 require 'puppet'
 require 'puppet/util/pidlock'
 require 'puppet/application'
 
 # A module that handles operations common to all daemons.  This is included
 # into the Server and Client base classes.
 class Puppet::Daemon
   attr_accessor :agent, :server, :argv
 
   def daemonname
     Puppet[:name]
   end
 
   # Put the daemon into the background.
   def daemonize
     if pid = fork
       Process.detach(pid)
       exit(0)
     end
 
     create_pidfile
 
     # Get rid of console logging
     Puppet::Util::Log.close(:console)
 
     Process.setsid
     Dir.chdir("/")
+  end
+
+  # Close stdin/stdout/stderr so that we can finish our transition into 'daemon' mode.
+  # @return nil
+  def self.close_streams()
+    Puppet.debug("Closing streams for daemon mode")
     begin
       $stdin.reopen "/dev/null"
       $stdout.reopen "/dev/null", "a"
       $stderr.reopen $stdout
       Puppet::Util::Log.reopen
+      Puppet.debug("Finished closing streams for daemon mode")
     rescue => detail
       Puppet.err "Could not start #{Puppet[:name]}: #{detail}"
       Puppet::Util::replace_file("/tmp/daemonout", 0644) do |f|
         f.puts "Could not start #{Puppet[:name]}: #{detail}"
       end
       exit(12)
     end
   end
 
+  # Convenience signature for calling Puppet::Daemon.close_streams
+  def close_streams()
+    Puppet::Daemon.close_streams
+  end
+
   # Create a pidfile for our daemon, so we can be stopped and others
   # don't try to start.
   def create_pidfile
     Puppet::Util.synchronize_on(Puppet[:name],Sync::EX) do
       raise "Could not create PID file: #{pidfile}" unless Puppet::Util::Pidlock.new(pidfile).lock
     end
   end
 
   # Provide the path to our pidfile.
   def pidfile
     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 '#{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 for our daemon.
   def remove_pidfile
     Puppet::Util.synchronize_on(Puppet[:name],Sync::EX) do
       Puppet::Util::Pidlock.new(pidfile).unlock
     end
   end
 
   def restart
     Puppet::Application.restart!
     reexec unless agent and agent.running?
   end
 
   def reopen_logs
     Puppet::Util::Log.reopen
   end
 
   # 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
     signals = {:INT => :stop, :TERM => :stop }
     # extended signals not supported under windows
     signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }) unless Puppet.features.microsoft_windows?
     signals.each do |signal, method|
       Signal.trap(signal) do
         Puppet.notice "Caught #{signal}; calling #{method}"
         send(method)
       end
     end
   end
 
   # Stop everything
   def stop(args = {:exit => true})
     Puppet::Application.stop!
 
     server.stop if server
 
     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
 
     # Start the listening server, if required.
     server.start if server
 
+    # now that the server has started, we've waited just about as long as possible to close
+    #  our streams and become a "real" daemon process.  This is in hopes of allowing
+    #  errors to have the console available as a fallback for logging for as long as
+    #  possible.
+    close_streams
+
     # Finally, loop forever running events - or, at least, until we exit.
     run_event_loop
   end
 
   def run_event_loop
     # Now, we loop waiting for either the configuration file to change, or the
     # next agent run to be due.  Fun times.
     #
     # We want to trigger the reparse if 15 seconds passed since the previous
     # wakeup, and the agent run if Puppet[:runinterval] seconds have passed
     # since the previous wakeup.
     #
     # We always want to run the agent on startup, so it was always before now.
     # Because 0 means "continuously run", `to_i` does the right thing when the
     # input is strange or badly formed by returning 0.  Integer will raise,
     # which we don't want, and we want to protect against -1 or below.
     next_agent_run = 0
     agent_run_interval = [Puppet[:runinterval].to_i, 0].max
 
     # We may not want to reparse; that can be disable.  Fun times.
     next_reparse = 0
     reparse_interval = Puppet[:filetimeout].to_i
 
     loop do
       now = Time.now.to_i
 
       # Handle reparsing of configuration files, if desired and required.
       # `reparse` will just check if the action is required, and would be
       # better named `reparse_if_changed` instead.
       if reparse_interval > 0 and now >= next_reparse
         Puppet.settings.reparse
 
         # The time to the next reparse might have changed, so recalculate
         # now.  That way we react dynamically to reconfiguration.
         reparse_interval = Puppet[:filetimeout].to_i
         next_reparse     = now + reparse_interval
 
         # We should also recalculate the agent run interval, and adjust the
         # next time it is scheduled to run, just in case.  In the event that
         # we made no change the result will be a zero second adjustment.
         new_run_interval    = [Puppet[:runinterval].to_i, 0].max
         next_agent_run     += agent_run_interval - new_run_interval
         agent_run_interval  = new_run_interval
       end
 
       # Handle triggering another agent run.  This will block the next check
       # for configuration reparsing, which is a desired and deliberate
       # behaviour.  You should not change that. --daniel 2012-02-21
       if agent and now >= next_agent_run
         agent.run
         next_agent_run = now + agent_run_interval
       end
 
       # Finally, an interruptable able sleep until the next scheduled event.
       # We also set a default wakeup of "one hour from now", which will
       # recheck everything at a minimum every hour.  Just in case something in
       # the math messes up or something; it should be inexpensive enough to
       # wake once an hour, then go back to sleep after doing nothing, if
       # someone only wants listen mode.
       next_event = now + 60 * 60
       next_event > next_reparse    and next_event = next_reparse
       next_event > next_agent_run  and next_event = next_agent_run
 
       how_long = next_event - now
 
       how_long > 0 and select([], [], [], how_long)
     end
   end
 end
 
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 1ca1779ef..4598f6596 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -1,1482 +1,1484 @@
 # The majority of Puppet's configuration settings are set in this file.
 module Puppet
 
   ############################################################################################
   # NOTE: For information about the available values for the ":type" property of settings,
   #   see the docs for Settings.define_settings
   ############################################################################################
 
   define_settings(:main,
     :confdir  => {
         :default  => nil,
         :type     => :directory,
         :desc     =>
             "The main Puppet configuration directory.  The default for this setting is calculated based on the user.  If the process\n" +
             "is running as root or the user that Puppet is supposed to run as, it defaults to a system directory, but if it's running as any other user,\n" +
             "it defaults to being in the user's home directory.",
     },
     :vardir   => {
         :default  => nil,
         :type     => :directory,
         :desc     => "Where Puppet stores dynamic and growing data.  The default for this setting is calculated specially, like `confdir`_.",
     },
 
     ### NOTE: this setting is usually being set to a symbol value.  We don't officially have a
     ###     setting type for that yet, but we might want to consider creating one.
     :name     => {
         :default  => nil,
         :desc     => "The name of the application, if we are running as one.  The\n" +
             "default is essentially $0 without the path or `.rb`.",
     },
 
     ## This setting needs to go away.  As a first step, we could just make it a first-class property of the Settings
     ##  class, instead of treating it as a normal setting.  There are places where the Settings class tries to use
     ##  the value of run_mode to help in resolving other values, and that is no good for nobody.  It would cause
     ##  infinite recursion and stack overflows without some chicanery... so, it needs to be cleaned up.
     ##
     ## As a longer term goal I think we should be looking into getting rid of run_mode altogether, but that is going
     ##  to be a larger undertaking, as it is being branched on in a lot of places in the current code.
     ##
     ## --cprice 2012-03-16
     :run_mode => {
         :default  => nil,
         :desc     => "The effective 'run mode' of the application: master, agent, or user.",
     }
   )
 
   define_settings(:main,
     :logdir => {
         :default  => nil,
         :type     => :directory,
         :mode     => 0750,
+        :owner    => "service",
+        :group    => "service",
         :desc     => "The directory in which to store log files",
     }
   )
 
   define_settings(:main,
     :trace => {
         :default  => false,
         :type     => :boolean,
         :desc     => "Whether to print stack traces on some errors",
     },
     :autoflush => {
       :default    => false,
       :type       => :boolean,
       :desc       => "Whether log files should always flush to disk.",
       :hook       => proc { |value| Log.autoflush = value }
     },
     :syslogfacility => {
         :default  => "daemon",
         :desc     => "What syslog facility to use when logging to\n" +
             "syslog.  Syslog has a fixed list of valid facilities, and you must\n" +
             "choose one of those; you cannot just make one up."
     },
     :statedir => {
         :default  => "$vardir/state",
         :type     => :directory,
         :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  => nil,
       :type     => :directory,
       :mode     => 01777,
       :desc     => "Where Puppet PID files are kept."
     },
     :genconfig => {
         :default  => false,
         :type     => :boolean,
         :desc     => "Whether to just print a configuration to stdout and exit.  Only makes\n" +
             "sense when used interactively.  Takes into account arguments specified\n" +
             "on the CLI.",
     },
     :genmanifest => {
         :default  => false,
         :type     => :boolean,
         :desc     => "Whether to just print a manifest to stdout and exit.  Only makes\n" +
             "sense when used interactively.  Takes into account arguments specified\n" +
             "on the CLI.",
     },
     :configprint => {
         :default  => "",
         :desc     => "Print the value of a specific configuration setting.  If the name of a\n" +
             "setting is provided for this, then the value is printed and puppet\n" +
             "exits.  Comma-separate multiple values.  For a list of all values,\n" +
             "specify 'all'.",
     },
     :color => {
       :default => (Puppet.features.microsoft_windows? ? "false" : "ansi"),
       :type    => :string,
       :desc    => "Whether to use colors when logging to the console.  Valid values are\n" +
           "`ansi` (equivalent to `true`), `html`, and `false`, which produces no color.\n" +
           "Defaults to false on Windows, as its console does not support ansi colors.",
     },
     :mkusers => {
         :default  => false,
         :type     => :boolean,
         :desc     => "Whether to create the necessary user and group that puppet agent will run as.",
     },
     :manage_internal_file_permissions => {
         :default  => true,
         :type     => :boolean,
         :desc     => "Whether Puppet should manage the owner, group, and mode of files it uses internally",
     },
     :onetime => {
         :default  => false,
         :type     => :boolean,
         :desc     => "Run the configuration once, rather than as a long-running\n" +
           "daemon. This is useful for interactively running puppetd.",
         :short    => 'o',
     },
     :path => {
         :default          => "none",
         :desc             => "The shell search path.  Defaults to whatever is inherited\n" +
             "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|
             ENV["PATH"] += File::PATH_SEPARATOR + path unless paths.include?(path)
           end
           value
         end
     },
     :libdir => {
         :type           => :directory,
         :default        => "$vardir/lib",
         :desc           => "An extra search path for Puppet.  This is only useful\n" +
             "for those files that Puppet will load on demand, and is only\n" +
             "guaranteed to work for those cases.  In fact, the autoload\n" +
             "mechanism is responsible for making sure this directory\n" +
             "is in Ruby's search path\n",
       #:call_on_define   => true, # Call our hook with the default value, so we always get the libdir set.
       :hook             => proc do |value|
         $LOAD_PATH.delete(@oldlibdir) if defined?(@oldlibdir) and $LOAD_PATH.include?(@oldlibdir)
         @oldlibdir = value
         $LOAD_PATH << value
       end
     },
     :ignoreimport => {
         :default  => false,
         :type     => :boolean,
         :desc     => "If true, allows the parser to continue without requiring\n" +
             "all files referenced with `import` statements to exist. This setting was primarily\n" +
             "designed for use with commit hooks for parse-checking.",
     },
     :authconfig => {
         :default  => "$confdir/namespaceauth.conf",
         :desc     => "The configuration file that defines the rights to the different\n" +
             "namespaces and methods.  This can be used as a coarse-grained\n" +
             "authorization system for both `puppet agent` and `puppet master`.",
     },
     :environment => {
         :default  => "production",
         :desc     => "The environment Puppet is running in.  For clients\n" +
             "(e.g., `puppet agent`) this determines the environment itself, which\n" +
             "is used to find modules and much more.  For servers (i.e., `puppet master`)\n" +
             "this provides the default environment for nodes we know nothing about."
     },
     :diff_args => {
         :default  => "-u",
         :desc     => "Which arguments to pass to the diff command when printing differences between\n" +
             "files. The command to use can be chosen with the `diff` setting.",
     },
     :diff => {
       :default => (Puppet.features.microsoft_windows? ? "" : "diff"),
       :desc    => "Which diff command to use when printing differences between files. This setting\n" +
         "has no default value on Windows, as standard `diff` is not available, but Puppet can use many\n" +
         "third-party diff tools.",
     },
     :show_diff => {
         :type     => :boolean,
         :default  => false,
         :desc     => "Whether to log and report a contextual diff when files are being replaced.  This causes\n" +
             "partial file contents to pass through Puppet's normal logging and reporting system, so this setting\n" +
             "should be used with caution if you are sending Puppet's reports to an insecure destination.\n" +
             "This feature currently requires the `diff/lcs` Ruby library.",
     },
     :daemonize => {
         :type     => :boolean,
         :default  => (Puppet.features.microsoft_windows? ? false : true),
         :desc     => "Whether to send the process into the background.  This defaults to true on POSIX systems,
           and to false on Windows (where Puppet currently cannot daemonize).",
         :short    => "D",
         :hook     => proc do |value|
           if value and Puppet.features.microsoft_windows?
             raise "Cannot daemonize on Windows"
           end
       end
     },
     :maximum_uid => {
         :default  => 4294967290,
         :desc     => "The maximum allowed UID.  Some platforms use negative UIDs\n" +
             "but then ship with tools that do not know how to handle signed ints, so the UIDs show up as\n" +
             "huge numbers that can then not be fed back into the system.  This is a hackish way to fail in a\n" +
             "slightly more useful way when that happens.",
     },
     :route_file => {
       :default    => "$confdir/routes.yaml",
       :desc       => "The YAML file containing indirector route configuration.",
     },
     :node_terminus => {
       :default    => "plain",
       :desc       => "Where to find information about nodes.",
     },
     :catalog_terminus => {
       :default    => "compiler",
       :desc       => "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 => {
       :default => 'facter',
       :desc => "The node facts terminus.",
       :hook => proc do |value|
         require 'puppet/node/facts'
         # Cache to YAML if we're uploading facts away
         if %w[rest inventory_service].include? value.to_s
           Puppet::Node::Facts.indirection.cache_class = :yaml
         end
       end
     },
     :inventory_terminus => {
       :default    => "$facts_terminus",
       :desc       => "Should usually be the same as the facts terminus",
     },
     :httplog => {
         :default  => "$logdir/http.log",
         :type     => :file,
         :owner    => "root",
         :mode     => 0640,
         :desc     => "Where the puppet agent web server logs.",
     },
     :http_proxy_host => {
       :default    => "none",
       :desc       => "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 => {
       :default    => 3128,
       :desc       => "The HTTP proxy port to use for outgoing connections",
     },
     :filetimeout => {
       :default    => 15,
       :desc       => "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 => {
       :default    => "stomp",
       :desc       => "Which type of queue to use for asynchronous processing.",
     },
     :queue_type => {
       :default    => "stomp",
       :desc       => "Which type of queue to use for asynchronous processing.",
     },
     :queue_source => {
       :default    => "stomp://localhost:61613/",
       :desc       => "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,
         :type     => :boolean,
         :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.indirection.cache_class = :queue
           else
             raise "Cannot disable asynchronous storeconfigs in a running process"
           end
         end
     },
     :thin_storeconfigs => {
       :default  => false,
       :type     => :boolean,
       :desc     =>
     "Boolean; whether 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 => {
       :default    => "",
       :desc       => "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 => {
         :default  => true,
         :type     => :boolean,
         :desc     => "Boolean; whether to use the zlib library",
     },
     :prerun_command => {
       :default    => "",
       :desc       => "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 => {
       :default    => "",
       :desc       => "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 => {
         :default  => false,
         :type     => :boolean,
         :desc     => "Freezes the 'main' class, disallowing any code to be added to it.  This\n" +
             "essentially means that you can't have any code outside of a node, class, or definition other\n" +
             "than in the site manifest.",
     }
   )
   Puppet.define_settings(:module_tool,
     :module_repository  => {
       :default  => 'http://forge.puppetlabs.com',
       :desc     => "The module repository",
     },
     :module_working_dir => {
         :default  => '$vardir/puppet-module',
         :desc     => "The directory into which module tool data is stored",
     }
   )
 
   hostname = Facter["hostname"].value
   domain = Facter["domain"].value
   if domain and domain != ""
     fqdn = [hostname, domain].join(".")
   else
     fqdn = hostname
   end
 
 
     Puppet.define_settings(
     :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 => {
       :default => '',
       :hook    => proc do |value|
         unless value.nil? or value == '' then
           Puppet.warning <<WARN
 The `certdnsnames` setting is no longer functional,
 after CVE-2011-3872. We ignore the value completely.
 
 For your own certificate request you can set `dns_alt_names` in the
 configuration and it will apply locally.  There is no configuration option to
 set DNS alt names, or any other `subjectAltName` value, for another nodes
 certificate.
 
 Alternately you can use the `--dns_alt_names` command line option to set the
 labels added while generating your own CSR.
 WARN
         end
       end,
       :desc    => <<EOT
 The `certdnsnames` setting is no longer functional,
 after CVE-2011-3872. We ignore the value completely.
 
 For your own certificate request you can set `dns_alt_names` in the
 configuration and it will apply locally.  There is no configuration option to
 set DNS alt names, or any other `subjectAltName` value, for another nodes
 certificate.
 
 Alternately you can use the `--dns_alt_names` command line option to set the
 labels added while generating your own CSR.
 EOT
     },
     :dns_alt_names => {
       :default => '',
       :desc    => <<EOT,
 The comma-separated list of alternative DNS names to use for the local host.
 
 When the node generates a CSR for itself, these are added to the request
 as the desired `subjectAltName` in the certificate: additional DNS labels
 that the certificate is also valid answering as.
 
 This is generally required if you use a non-hostname `certname`, or if you
 want to use `puppet kick` or `puppet resource -H` and the primary certname
 does not match the DNS name you use to communicate with the host.
 
 This is unnecessary for agents, unless you intend to use them as a server for
 `puppet kick` or remote `puppet resource` management.
 
 It is rarely necessary for servers; it is usually helpful only if you need to
 have a pool of multiple load balanced masters, or for the same master to
 respond on two physically separate networks under different names.
 EOT
     },
     :certdir => {
       :default => "$ssldir/certs",
       :type   => :directory,
       :owner => "service",
       :desc => "The certificate directory."
     },
     :ssldir => {
       :default => "$confdir/ssl",
       :type   => :directory,
       :mode => 0771,
       :owner => "service",
       :desc => "Where SSL certificates are kept."
     },
     :publickeydir => {
       :default => "$ssldir/public_keys",
       :type   => :directory,
       :owner => "service",
       :desc => "The public key directory."
     },
     :requestdir => {
       :default => "$ssldir/certificate_requests",
       :type   => :directory,
       :type => :directory,
       :owner => "service",
       :desc => "Where host certificate requests are stored."
     },
     :privatekeydir => {
       :default => "$ssldir/private_keys",
       :type   => :directory,
       :mode => 0750,
       :owner => "service",
       :desc => "The private key directory."
     },
     :privatedir => {
       :default => "$ssldir/private",
       :type   => :directory,
       :mode => 0750,
       :owner => "service",
       :desc => "Where the client stores private certificate information."
     },
     :passfile => {
       :default => "$privatedir/password",
       :type   => :file,
       :mode => 0640,
       :owner => "service",
       :desc => "Where puppet agent stores the password for its private key.
         Generally unused."
     },
     :hostcsr => {
       :default => "$ssldir/csr_$certname.pem",
       :type   => :file,
       :mode => 0644,
       :owner => "service",
       :desc => "Where individual hosts store and look for their certificate requests."
     },
     :hostcert => {
       :default => "$certdir/$certname.pem",
       :type   => :file,
       :mode => 0644,
       :owner => "service",
       :desc => "Where individual hosts store and look for their certificates."
     },
     :hostprivkey => {
       :default => "$privatekeydir/$certname.pem",
       :type   => :file,
       :mode => 0600,
       :owner => "service",
       :desc => "Where individual hosts store and look for their private key."
     },
     :hostpubkey => {
       :default => "$publickeydir/$certname.pem",
       :type   => :file,
       :mode => 0644,
       :owner => "service",
       :desc => "Where individual hosts store and look for their public key."
     },
     :localcacert => {
       :default => "$certdir/ca.pem",
       :type   => :file,
       :mode => 0644,
       :owner => "service",
       :desc => "Where each client stores the CA certificate."
     },
     :hostcrl => {
       :default => "$ssldir/crl.pem",
       :type   => :file,
       :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 => {
         :default  => true,
         :type     => :boolean,
         :desc     => "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.",
     }
   )
 
     define_settings(
     :ca,
     :ca_name => {
       :default    => "Puppet CA: $certname",
       :desc       => "The name to use the Certificate Authority certificate.",
     },
     :cadir => {
       :default => "$ssldir/ca",
       :type => :directory,
       :owner => "service",
       :group => "service",
       :mode => 0770,
       :desc => "The root directory for the certificate authority."
     },
     :cacert => {
       :default => "$cadir/ca_crt.pem",
       :type => :file,
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "The CA certificate."
     },
     :cakey => {
       :default => "$cadir/ca_key.pem",
       :type => :file,
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "The CA private key."
     },
     :capub => {
       :default => "$cadir/ca_pub.pem",
       :type => :file,
       :owner => "service",
       :group => "service",
       :desc => "The CA public key."
     },
     :cacrl => {
       :default => "$cadir/ca_crl.pem",
       :type => :file,
       :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.deprecation_warning "Setting the :cacrl to 'false' is deprecated; Puppet will just ignore the crl if yours is missing"
         end
       end
     },
     :caprivatedir => {
       :default => "$cadir/private",
       :type => :directory,
       :owner => "service",
       :group => "service",
       :mode => 0770,
       :desc => "Where the CA stores private certificate information."
     },
     :csrdir => {
       :default => "$cadir/requests",
       :type => :directory,
       :owner => "service",
       :group => "service",
       :desc => "Where the CA stores certificate requests"
     },
     :signeddir => {
       :default => "$cadir/signed",
       :type => :directory,
       :owner => "service",
       :group => "service",
       :mode => 0770,
       :desc => "Where the CA stores signed certificates."
     },
     :capass => {
       :default => "$caprivatedir/ca.pass",
       :type => :file,
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "Where the CA stores the password for the private key"
     },
     :serial => {
       :default => "$cadir/serial",
       :type => :file,
       :owner => "service",
       :group => "service",
       :mode => 0644,
       :desc => "Where the serial number for certificates is stored."
     },
     :autosign => {
       :default => "$confdir/autosign.conf",
       :type => :file,
       :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."},
     :allow_duplicate_certs => {
       :default    => false,
       :type       => :boolean,
       :desc       => "Whether to allow a new certificate
       request to overwrite an existing certificate.",
     },
     :ca_days => {
       :default    => "",
       :desc       => "How long a certificate should be valid, in days.
       This setting is deprecated; use `ca_ttl` instead",
     },
     :ca_ttl => {
       :default    => "5y",
       :desc       => "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 setting
       is set, ca_days is ignored. Examples are '3600' (one hour)
       and '1825d', which is the same as '5y' (5 years) ",
     },
     :ca_md => {
       :default    => "md5",
       :desc       => "The type of hash used in certificates.",
     },
     :req_bits => {
       :default    => 4096,
       :desc       => "The bit length of the certificates.",
     },
     :keylength => {
       :default    => 4096,
       :desc       => "The bit length of keys.",
     },
     :cert_inventory => {
       :default => "$cadir/inventory.txt",
       :type => :file,
       :mode => 0644,
       :owner => "service",
       :group => "service",
       :desc => "A Complete listing of all certificates"
     }
   )
 
   # Define the config default.
 
     define_settings(:application,
       :config_file_name => {
           :type     => :string,
           :default  => Puppet::Util::Settings.default_config_file_name,
           :desc     => "The name of the puppet config file.",
       },
       :config => {
           :type => :file,
           :default  => "$confdir/${config_file_name}",
           :desc     => "The configuration file for the current puppet application",
       },
       :pidfile => {
           :type => :file,
           :default  => "$rundir/$name.pid",
           :desc     => "The pid file",
       },
       :bindaddress => {
         :default    => "",
         :desc       => "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] == "" }
       }
   )
 
   define_settings(:master,
     :user => {
       :default    => "puppet",
       :desc       => "The user puppet master should run as.",
     },
     :group => {
       :default    => "puppet",
       :desc       => "The group puppet master should run as.",
     },
     :manifestdir => {
       :default    => "$confdir/manifests",
       :type       => :directory,
       :desc       => "Where puppet master looks for its manifests.",
     },
     :manifest => {
       :default    => "$manifestdir/site.pp",
       :type       => :file,
       :desc       => "The entry-point manifest for puppet master.",
     },
     :code => {
       :default    => "",
       :desc       => "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",
       :type => :file,
       :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",
       :type => :file,
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :create => true,
       :desc => "Where the puppet master web server logs."
     },
     :masterport => {
       :default    => 8140,
       :desc       => "Which port puppet master listens on.",
     },
     :node_name => {
       :default    => "cert",
       :desc       => "How the puppet master 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",
       :type => :directory,
       :mode => 0750,
       :owner => "service",
       :group => "service",
       :desc => "Where FileBucket files are stored."
     },
     :rest_authconfig => {
       :default    => "$confdir/auth.conf",
       :type       => :file,
       :desc       => "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 => {
       :default    => true,
       :type       => :boolean,
       :desc       => "Whether the master should function as a certificate authority.",
     },
     :modulepath => {
       :default => "$confdir/modules#{File::PATH_SEPARATOR}/usr/share/puppet/modules",
       :type => :path,
       :desc => "The search path for modules, as a list of directories separated by the system path separator character. " +
           "(The POSIX path separator is ':', and the Windows path separator is ';'.)",
     },
     :ssl_client_header => {
       :default    => "HTTP_X_CLIENT_DN",
       :desc       => "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 => {
       :default    => "HTTP_X_CLIENT_VERIFY",
       :desc       => "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",
       :type => :directory,
       :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",
       :type => :directory,
       :owner => "service",
       :group => "service",
       :mode => "750",
       :desc => "The directory in which serialized data is stored, usually in a subdirectory."},
     :reports => {
       :default    => "store",
       :desc       => "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",
       :type => :directory,
       :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 => {
       :default    => "http://localhost:3000/reports/upload",
       :desc       => "The URL used by the http reports processor to send reports",
     },
     :fileserverconfig => {
       :default    => "$confdir/fileserver.conf",
       :type       => :file,
       :desc       => "Where the fileserver configuration is stored.",
     },
     :strict_hostname_checking => {
       :default    => false,
       :desc       => "Whether to only search for the complete
             hostname as it is in the certificate when searching for node information
             in the catalogs.",
     }
   )
 
   define_settings(:metrics,
     :rrddir => {
       :type     => :directory,
       :default  => "$vardir/rrd",
       :mode     => 0750,
       :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 => {
       :default  => "$runinterval",
       :desc     => "How often RRD should expect data.
             This should match how often the hosts report back to the server.",
     }
   )
 
   define_settings(:device,
     :devicedir =>  {
         :default  => "$vardir/devices",
         :type     => :directory,
         :mode     => "750",
         :desc     => "The root directory of devices' $vardir",
     },
     :deviceconfig => {
         :default  => "$confdir/device.conf",
         :desc     => "Path to the device config file for puppet device",
     }
   )
 
   define_settings(:agent,
     :node_name_value => {
       :default => "$certname",
       :desc => "The explicit value used for the node name for all requests the agent
         makes to the master. WARNING: This setting is mutually exclusive with
         node_name_fact.  Changing this setting also requires changes to the default
         auth.conf configuration on the Puppet Master.  Please see
         http://links.puppetlabs.com/node_name_value for more information."
     },
     :node_name_fact => {
       :default => "",
       :desc => "The fact name used to determine the node name used for all requests the agent
         makes to the master. WARNING: This setting is mutually exclusive with
         node_name_value.  Changing this setting also requires changes to the default
         auth.conf configuration on the Puppet Master.  Please see
         http://links.puppetlabs.com/node_name_fact for more information.",
       :hook => proc do |value|
         if !value.empty? and Puppet[:node_name_value] != Puppet[:certname]
           raise "Cannot specify both the node_name_value and node_name_fact settings"
         end
       end
     },
     :localconfig => {
       :default => "$statedir/localconfig",
       :type => :file,
       :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",
       :type => :file,
       :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",
       :type => :directory,
       :mode => "750",
       :desc => "The directory in which client-side YAML data is stored."
     },
     :client_datadir => {
       :default => "$vardir/client_data",
       :type => :directory,
       :mode => "750",
       :desc => "The directory in which serialized data is stored on the client."
     },
     :classfile => {
       :default => "$statedir/classes.txt",
       :type => :file,
       :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."},
     :resourcefile => {
       :default => "$statedir/resources.txt",
       :type => :file,
       :owner => "root",
       :mode => 0644,
       :desc => "The file in which puppet agent stores a list of the resources
         associated with the retrieved configuration."  },
     :puppetdlog => {
       :default => "$logdir/puppetd.log",
       :type => :file,
       :owner => "root",
       :mode => 0640,
       :desc => "The log file for puppet agent.  This is generally not used."
     },
     :server => {
       :default => "puppet",
       :desc => "The server to which the puppet agent should connect"
     },
     :use_srv_records => {
       :default    => true,
       :type       => :boolean,
       :desc       => "Whether the server will search for SRV records in DNS for the current domain.",
     },
     :srv_domain => {
       :default    => "#{domain}",
       :desc       => "The domain which will be queried to find the SRV records of servers to use.",
     },
     :ignoreschedules => {
       :default    => false,
       :type       => :boolean,
     :desc         => "Boolean; whether puppet agent should ignore schedules.  This is useful
       for initial puppet agent runs.",
     },
     :puppetport => {
       :default    => 8139,
       :desc       => "Which port puppet agent listens on.",
     },
     :noop => {
       :default    => false,
       :type       => :boolean,
       :desc       => "Whether puppet agent should be run in noop mode.",
     },
     :runinterval => {
       :default  => 1800, # 30 minutes
       :desc     => "How often puppet agent applies the client configuration; in seconds.
           Note that a runinterval of 0 means \"run continuously\" rather than
           \"never run.\" If you want puppet agent to never run, you should start
           it with the `--no-client` option.",
     },
     :listen => {
       :default    => false,
       :type       => :boolean,
       :desc       => "Whether puppet agent should listen for
       connections.  If this is true, then puppet agent will accept incoming
       REST API requests, subject to the default ACLs and the ACLs set in
       the `rest_authconfig` file. Puppet agent can respond usefully to
       requests on the `run`, `facts`, `certificate`, and `resource` endpoints.",
     },
     :ca_server => {
       :default    => "$server",
       :desc       => "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 => {
       :default    => "$masterport",
       :desc       => "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.deprecation_warning "Setting 'catalog_format' is deprecated; use 'preferred_serialization_format' instead."
           Puppet.settings[:preferred_serialization_format] = value
         end
       }
     },
     :preferred_serialization_format => {
       :default    => "pson",
       :desc       => "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 => {
       :default    => "$statedir/puppetdlock",
     :type         => :file,
       :desc       => "A lock file to temporarily stop puppet agent from doing anything.",
     },
     :usecacheonfailure => {
       :default    => true,
       :type       => :boolean,
       :desc       => "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 => {
       :default    => false,
       :type       => :boolean,
       :desc       => "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 => {
       :default    => false,
       :type       => :boolean,
       :desc       => "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 => {
       :default    => false,
       :type       => :boolean,
       :desc       => "Whether facts should be made all lowercase when sent to the server.",
     },
     :dynamicfacts => {
       :default    => "memorysize,memoryfree,swapsize,swapfree",
       :desc       => "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 => {
       :default    => "$runinterval",
       :desc       => "The maximum time to delay before runs.  Defaults to being the same as the
       run interval.",
     },
     :splay => {
       :default    => false,
       :type       => :boolean,
       :desc       => "Whether to sleep for a pseudo-random (but consistent) amount of time before
       a run.",
     },
     :clientbucketdir => {
       :default  => "$vardir/clientbucket",
       :type     => :directory,
       :mode     => 0750,
       :desc     => "Where FileBucket files are stored locally."
     },
     :configtimeout => {
       :default  => 120,
       :desc     => "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|
         Puppet.settings[:report_server] = value if value
       end
     },
     :report_server => {
       :default  => "$server",
       :desc     => "The server to send transaction reports to.",
     },
     :report_port => {
       :default  => "$masterport",
       :desc     => "The port to communicate with the report_server.",
     },
     :inventory_server => {
       :default  => "$server",
       :desc     => "The server to send facts to.",
     },
     :inventory_port => {
       :default  => "$masterport",
       :desc     => "The port to communicate with the inventory_server.",
     },
     :report => {
       :default  => true,
       :type     => :boolean,
       :desc     => "Whether to send reports after every transaction.",
     },
     :lastrunfile =>  {
       :default  => "$statedir/last_run_summary.yaml",
       :type     => :file,
       :mode     => 0644,
       :desc     => "Where puppet agent stores the last run report summary in yaml format."
     },
     :lastrunreport =>  {
       :default  => "$statedir/last_run_report.yaml",
       :type     => :file,
       :mode     => 0644,
       :desc     => "Where puppet agent stores the last run report in yaml format."
     },
     :graph => {
       :default  => false,
       :type     => :boolean,
       :desc     => "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 => {
       :default    => "$statedir/graphs",
       :type       => :directory,
       :desc       => "Where to store dot-outputted graphs.",
     },
     :http_compression => {
       :default    => false,
       :type       => :boolean,
       :desc       => "Allow http compression in REST communication with the master.
       This setting might improve performance for agent -> master communications over slow WANs.
       Your puppet master needs to support compression (usually by activating some settings in a reverse-proxy
       in front of the puppet master, 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.",
     },
     :waitforcert => {
         :default  => 120, # 2 minutes
         :desc     => "The time interval, specified in seconds, 'puppet agent' should connect to the server
             and ask it to sign a certificate request. This is useful for the initial setup of a
             puppet client. You can turn off waiting for certificates by specifying a time of 0.",
     }
   )
 
   define_settings(:inspect,
     :archive_files => {
         :type     => :boolean,
         :default  => false,
         :desc     => "During an inspect run, whether to archive files whose contents are audited to a file bucket.",
     },
     :archive_file_server => {
         :default  => "$server",
         :desc     => "During an inspect run, the file bucket server to archive files to if archive_files is set.",
     }
   )
 
   # Plugin information.
 
     define_settings(
     :main,
     :plugindest => {
       :type       => :directory,
       :default    => "$libdir",
       :desc       => "Where Puppet should store plugins that it pulls down from the central
       server.",
     },
     :pluginsource => {
       :default    => "puppet://$server/plugins",
       :desc       => "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 => {
       :default    => true,
       :type       => :boolean,
       :desc       => "Whether plugins should be synced with the central server.",
     },
 
     :pluginsignore => {
         :default  => ".svn CVS .git",
         :desc     => "What files to ignore when pulling down plugins.",
     }
   )
 
   # Central fact information.
 
     define_settings(
     :main,
     :factpath => {
       :type     => :path,
       :default  => "$vardir/lib/facter#{File::PATH_SEPARATOR}$vardir/facts",
       :desc     => "Where Puppet should look for facts.  Multiple directories should
         be separated by the system path separator character. (The POSIX path separator is ':', and the Windows path separator is ';'.)",
 
       #:call_on_define => true, # Call our hook with the default value, so we always get the value added to facter.
       :hook => proc { |value| Facter.search(value) if Facter.respond_to?(:search) }}
   )
 
 
     define_settings(
     :tagmail,
     :tagmap => {
       :default    => "$confdir/tagmail.conf",
       :desc       => "The mapping between reporting tags and email addresses.",
     },
     :sendmail => {
       :default    => which('sendmail') || '',
       :desc       => "Where to find the sendmail binary with which to send email.",
     },
 
     :reportfrom => {
         :default  => "report@" + [Facter["hostname"].value,Facter["domain"].value].join("."),
         :desc     => "The 'from' email address for the reports.",
     },
 
     :smtpserver => {
         :default  => "none",
         :desc     => "The server through which to send email reports.",
     }
   )
 
     define_settings(
     :rails,
     :dblocation => {
       :default  => "$statedir/clientconfigs.sqlite3",
       :type     => :file,
       :mode     => 0660,
       :owner    => "service",
       :group    => "service",
       :desc     => "The database cache for client configurations.  Used for
         querying within the language."
     },
     :dbadapter => {
       :default  => "sqlite3",
       :desc     => "The type of database to use.",
     },
     :dbmigrate => {
       :default  => false,
       :type     => :boolean,
       :desc     => "Whether to automatically migrate the database.",
     },
     :dbname => {
       :default  => "puppet",
       :desc     => "The name of the database to use.",
     },
     :dbserver => {
       :default  => "localhost",
       :desc     => "The database server for caching. Only
       used when networked databases are used.",
     },
     :dbport => {
       :default  => "",
       :desc     => "The database password for caching. Only
       used when networked databases are used.",
     },
     :dbuser => {
       :default  => "puppet",
       :desc     => "The database user for caching. Only
       used when networked databases are used.",
     },
     :dbpassword => {
       :default  => "puppet",
       :desc     => "The database password for caching. Only
       used when networked databases are used.",
     },
     :dbconnections => {
       :default  => '',
       :desc     => "The number of database connections for networked
       databases.  Will be ignored unless the value is a positive integer.",
     },
     :dbsocket => {
       :default  => "",
       :desc     => "The database socket location. Only used when networked
       databases are used.  Will be ignored if the value is an empty string.",
     },
     :railslog => {
       :default  => "$logdir/rails.log",
       :type     => :file,
       :mode     => 0600,
       :owner    => "service",
       :group    => "service",
       :desc     => "Where Rails-specific logs are sent"
     },
 
     :rails_loglevel => {
         :default  => "info",
         :desc     => "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`.",
     }
   )
 
     define_settings(
     :couchdb,
 
     :couchdb_url => {
         :default  => "http://127.0.0.1:5984/puppet",
         :desc     => "The url where the puppet couchdb database will be created",
     }
   )
 
     define_settings(
     :transaction,
     :tags => {
       :default    => "",
       :desc       => "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 => {
       :default    => false,
       :type       => :boolean,
       :desc       => "Whether each resource should log when it is
       being evaluated.  This allows you to interactively see exactly
       what is being done.",
     },
     :summarize => {
         :default  => false,
         :type     => :boolean,
         :desc     => "Whether to print a transaction summary.",
     }
   )
 
     define_settings(
     :main,
     :external_nodes => {
         :default  => "none",
         :desc     => "An external command that can produce node information.  The command's output
             must be a YAML dump of a hash, and that hash must have a `classes` key and/or
             a `parameters` key, where `classes` is an array or hash and
             `parameters` is a hash.  For unknown nodes, the command 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.",
     }
     )
 
         define_settings(
         :ldap,
     :ldapnodes => {
       :default  => false,
       :type     => :boolean,
       :desc     => "Whether to search for node configurations in LDAP.  See
       http://projects.puppetlabs.com/projects/puppet/wiki/LDAP_Nodes for more information.",
     },
     :ldapssl => {
       :default  => false,
       :type   => :boolean,
       :desc   => "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 => {
       :default  => false,
       :type     => :boolean,
       :desc     => "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 => {
       :default  => "ldap",
       :desc     => "The LDAP server.  Only used if `ldapnodes` is enabled.",
     },
     :ldapport => {
       :default  => 389,
       :desc     => "The LDAP port.  Only used if `ldapnodes` is enabled.",
     },
 
     :ldapstring => {
       :default  => "(&(objectclass=puppetClient)(cn=%s))",
       :desc     => "The search string used to find an LDAP node.",
     },
     :ldapclassattrs => {
       :default  => "puppetclass",
       :desc     => "The LDAP attributes to use to define Puppet classes.  Values
       should be comma-separated.",
     },
     :ldapstackedattrs => {
       :default  => "puppetvar",
       :desc     => "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 => {
       :default  => "all",
       :desc     => "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 => {
       :default  => "parentnode",
       :desc     => "The attribute to use to define the parent node.",
     },
     :ldapuser => {
       :default  => "",
       :desc     => "The user to use to connect to LDAP.  Must be specified as a
       full DN.",
     },
     :ldappassword => {
       :default  => "",
       :desc     => "The password to use to connect to LDAP.",
     },
     :ldapbase => {
         :default  => "",
         :desc     => "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.",
     }
   )
 
   define_settings(:master,
     :storeconfigs => {
       :default  => false,
       :type     => :boolean,
       :desc     => "Whether to store each client's configuration, including catalogs, facts,
 and related data.  This also enables the import and export of resources in
 the Puppet language - a mechanism for exchange resources between nodes.
 
 By default this uses ActiveRecord and an SQL database to store and query
 the data; this, in turn, will depend on Rails being available.
 
 You can adjust the backend using the storeconfigs_backend setting.",
       # Call our hook with the default value, so we always get the libdir set.
       #:call_on_define => true,
       :hook => proc do |value|
         require 'puppet/node'
         require 'puppet/node/facts'
         if value
           Puppet.settings[:async_storeconfigs] or
             Puppet::Resource::Catalog.indirection.cache_class = :store_configs
           Puppet::Node::Facts.indirection.cache_class = :store_configs
           Puppet::Node.indirection.cache_class = :store_configs
 
           Puppet::Resource.indirection.terminus_class = :store_configs
         end
       end
     },
     :storeconfigs_backend => {
       :default => "active_record",
       :desc => "Configure the backend terminus used for StoreConfigs.
 By default, this uses the ActiveRecord store, which directly talks to the
 database from within the Puppet Master process."
     }
   )
 
   # This doesn't actually work right now.
 
     define_settings(
     :parser,
 
     :lexical => {
       :default  => false,
       :type     => :boolean,
       :desc     => "Whether to use lexical scoping (vs. dynamic).",
     },
     :templatedir => {
         :default  => "$vardir/templates",
         :type     => :directory,
         :desc     => "Where Puppet looks for template files.  Can be a list of colon-separated
       directories.",
     }
   )
   define_settings(
     :puppetdoc,
     :document_all => {
         :default  => false,
         :type     => :boolean,
         :desc     => "Document all resources",
     }
   )
 end
diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb
index f92d600a5..a328a1ba8 100644
--- a/lib/puppet/network/server.rb
+++ b/lib/puppet/network/server.rb
@@ -1,139 +1,137 @@
 require 'puppet/network/http'
 require 'puppet/util/pidlock'
 
 class Puppet::Network::Server
   attr_reader :server_type, :address, :port
 
+
+  # TODO: does anything actually call this?  It seems like it's a duplicate of the code in Puppet::Daemon, but that
+  #  it's not actually called anywhere.
+
   # Put the daemon into the background.
   def daemonize
     if pid = fork
       Process.detach(pid)
       exit(0)
     end
 
     # Get rid of console logging
     Puppet::Util::Log.close(:console)
 
     Process.setsid
     Dir.chdir("/")
-    begin
-      $stdin.reopen "/dev/null"
-      $stdout.reopen "/dev/null", "a"
-      $stderr.reopen $stdout
-      Puppet::Util::Log.reopen
-    rescue => detail
-      Puppet::Util.replace_file("/tmp/daemonout", 0644) { |f|
-        f.puts "Could not start #{Puppet[:name]}: #{detail}"
-      }
-      raise "Could not start #{Puppet[:name]}: #{detail}"
-    end
+  end
+
+  def close_streams()
+    Puppet::Daemon.close_streams()
   end
 
   # Create a pidfile for our daemon, so we can be stopped and others
   # don't try to start.
   def create_pidfile
     Puppet::Util.synchronize_on(Puppet[:name],Sync::EX) do
       raise "Could not create PID file: #{pidfile}" unless Puppet::Util::Pidlock.new(pidfile).lock
     end
   end
 
   # Remove the pid file for our daemon.
   def remove_pidfile
     Puppet::Util.synchronize_on(Puppet[:name],Sync::EX) do
       Puppet::Util::Pidlock.new(pidfile).unlock
     end
   end
 
   # Provide the path to our pidfile.
   def pidfile
     Puppet[:pidfile]
   end
 
   def initialize(args = {})
     valid_args = [:handlers, :port]
     bad_args = args.keys.find_all { |p| ! valid_args.include?(p) }.collect { |p| p.to_s }.join(",")
     raise ArgumentError, "Invalid argument(s) #{bad_args}" unless bad_args == ""
     @server_type = Puppet[:servertype] or raise "No servertype configuration found."  # e.g.,  WEBrick, Mongrel, etc.
     http_server_class || raise(ArgumentError, "Could not determine HTTP Server class for server type [#{@server_type}]")
 
     @port = args[:port] || Puppet[:masterport] || raise(ArgumentError, "Must specify :port or configure Puppet :masterport")
     @address = determine_bind_address
 
     @listening = false
     @routes = {}
     self.register(args[:handlers]) if args[:handlers]
 
     # Make sure we have all of the directories we need to function.
     #Puppet.settings.use(:main, :ssl, Puppet[:name])
     Puppet.settings.use(:main, :ssl, :application)
   end
 
   # Register handlers for REST networking, based on the Indirector.
   def register(*indirections)
     raise ArgumentError, "Indirection names are required." if indirections.empty?
     indirections.flatten.each do |name|
       Puppet::Indirector::Indirection.model(name) || raise(ArgumentError, "Cannot locate indirection '#{name}'.")
       @routes[name.to_sym] = true
     end
   end
 
   # Unregister Indirector handlers.
   def unregister(*indirections)
     raise "Cannot unregister indirections while server is listening." if listening?
     indirections = @routes.keys if indirections.empty?
 
     indirections.flatten.each do |i|
       raise(ArgumentError, "Indirection [#{i}] is unknown.") unless @routes[i.to_sym]
     end
 
     indirections.flatten.each do |i|
       @routes.delete(i.to_sym)
     end
   end
 
   def listening?
     @listening
   end
 
   def listen
     raise "Cannot listen -- already listening." if listening?
     @listening = true
     http_server.listen(:address => address, :port => port, :handlers => @routes.keys)
   end
 
   def unlisten
     raise "Cannot unlisten -- not currently listening." unless listening?
     http_server.unlisten
     @listening = false
   end
 
   def http_server_class
     http_server_class_by_type(@server_type)
   end
 
   def start
     create_pidfile
+    close_streams
     listen
   end
 
   def stop
     unlisten
     remove_pidfile
   end
 
   private
 
   def http_server
     @http_server ||= http_server_class.new
   end
 
   def http_server_class_by_type(kind)
     Puppet::Network::HTTP.server_class_by_type(kind)
   end
 
   def determine_bind_address
     tmp = Puppet[:bindaddress]
     return tmp if tmp != ""
     server_type.to_s == "webrick" ? "0.0.0.0" : "127.0.0.1"
   end
 end
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index 9d1e56367..76bfbe6fd 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -1,520 +1,529 @@
 # A module to collect utility functions.
 
 require 'English'
 require 'puppet/external/lock'
 require 'puppet/error'
 require 'puppet/util/execution_stub'
 require 'uri'
 require 'sync'
 require 'monitor'
 require 'tempfile'
 require 'pathname'
 
 module Puppet
 module Util
   require 'puppet/util/monkey_patches'
   require 'benchmark'
 
   # These are all for backward compatibility -- these are methods that used
   # to be in Puppet::Util but have been moved into external modules.
   require 'puppet/util/posix'
   extend Puppet::Util::POSIX
 
   @@sync_objects = {}.extend MonitorMixin
 
 
   def self.activerecord_version
     if (defined?(::ActiveRecord) and defined?(::ActiveRecord::VERSION) and defined?(::ActiveRecord::VERSION::MAJOR) and defined?(::ActiveRecord::VERSION::MINOR))
       ([::ActiveRecord::VERSION::MAJOR, ::ActiveRecord::VERSION::MINOR].join('.').to_f)
     else
       0
     end
   end
 
 
   # Run some code with a specific environment.  Resets the environment back to
   # what it was at the end of the code.
   def self.withenv(hash)
     saved = ENV.to_hash
     hash.each do |name, val|
       ENV[name.to_s] = val
     end
 
     yield
   ensure
     ENV.clear
     saved.each do |name, val|
       ENV[name] = val
     end
   end
 
 
   # Execute a given chunk of code with a new umask.
   def self.withumask(mask)
     cur = File.umask(mask)
 
     begin
       yield
     ensure
       File.umask(cur)
     end
   end
 
 
   def self.synchronize_on(x,type)
     sync_object,users = 0,1
     begin
       @@sync_objects.synchronize {
         (@@sync_objects[x] ||= [Sync.new,0])[users] += 1
       }
       @@sync_objects[x][sync_object].synchronize(type) { yield }
     ensure
       @@sync_objects.synchronize {
         @@sync_objects.delete(x) unless (@@sync_objects[x][users] -= 1) > 0
       }
     end
   end
 
   # Change the process to a different user
   def self.chuser
     if group = Puppet[:group]
       begin
         Puppet::Util::SUIDManager.change_group(group, true)
       rescue => detail
         Puppet.warning "could not change to group #{group.inspect}: #{detail}"
         $stderr.puts "could not change to group #{group.inspect}"
 
         # Don't exit on failed group changes, since it's
         # not fatal
         #exit(74)
       end
     end
 
     if user = Puppet[:user]
       begin
         Puppet::Util::SUIDManager.change_user(user, true)
       rescue => detail
         $stderr.puts "Could not change to user #{user}: #{detail}"
         exit(74)
       end
     end
   end
 
   # Create instance methods for each of the log levels.  This allows
   # the messages to be a little richer.  Most classes will be calling this
   # method.
   def self.logmethods(klass, useself = true)
     Puppet::Util::Log.eachlevel { |level|
       klass.send(:define_method, level, proc { |args|
         args = args.join(" ") if args.is_a?(Array)
         if useself
 
           Puppet::Util::Log.create(
             :level => level,
             :source => self,
             :message => args
           )
         else
 
           Puppet::Util::Log.create(
             :level => level,
             :message => args
           )
         end
       })
     }
   end
 
   # Proxy a bunch of methods to another object.
   def self.classproxy(klass, objmethod, *methods)
     classobj = class << klass; self; end
     methods.each do |method|
       classobj.send(:define_method, method) do |*args|
         obj = self.send(objmethod)
 
         obj.send(method, *args)
       end
     end
   end
 
   # Proxy a bunch of methods to another object.
   def self.proxy(klass, objmethod, *methods)
     methods.each do |method|
       klass.send(:define_method, method) do |*args|
         obj = self.send(objmethod)
 
         obj.send(method, *args)
       end
     end
   end
 
 
   def benchmark(*args)
     msg = args.pop
     level = args.pop
     object = nil
 
     if args.empty?
       if respond_to?(level)
         object = self
       else
         object = Puppet
       end
     else
       object = args.pop
     end
 
     raise Puppet::DevError, "Failed to provide level to :benchmark" unless level
 
     unless level == :none or object.respond_to? level
       raise Puppet::DevError, "Benchmarked object does not respond to #{level}"
     end
 
     # Only benchmark if our log level is high enough
     if level != :none and Puppet::Util::Log.sendlevel?(level)
       result = nil
       seconds = Benchmark.realtime {
         yield
       }
       object.send(level, msg + (" in %0.2f seconds" % seconds))
       return seconds
     else
       yield
     end
   end
 
   def which(bin)
     if absolute_path?(bin)
       return bin if FileTest.file? bin and FileTest.executable? bin
     else
       ENV['PATH'].split(File::PATH_SEPARATOR).each do |dir|
         begin
           dest = File.expand_path(File.join(dir, bin))
         rescue ArgumentError => e
           # if the user's PATH contains a literal tilde (~) character and HOME is not set, we may get
           # an ArgumentError here.  Let's check to see if that is the case; if not, re-raise whatever error
           # was thrown.
           raise e unless ((dir =~ /~/) && ((ENV['HOME'].nil? || ENV['HOME'] == "")))
 
           # if we get here they have a tilde in their PATH.  We'll issue a single warning about this and then
           # ignore this path element and carry on with our lives.
           Puppet::Util::Warnings.warnonce("PATH contains a ~ character, and HOME is not set; ignoring PATH element '#{dir}'.")
           next
         end
         if Puppet.features.microsoft_windows? && File.extname(dest).empty?
           exts = ENV['PATHEXT']
           exts = exts ? exts.split(File::PATH_SEPARATOR) : %w[.COM .EXE .BAT .CMD]
           exts.each do |ext|
             destext = File.expand_path(dest + ext)
 
             return destext if FileTest.file? destext and FileTest.executable? destext
           end
         end
         return dest if FileTest.file? dest and FileTest.executable? dest
       end
     end
     nil
   end
   module_function :which
 
   # Determine in a platform-specific way whether a path is absolute. This
   # defaults to the local platform if none is specified.
   def absolute_path?(path, platform=nil)
     # Escape once for the string literal, and once for the regex.
     slash = '[\\\\/]'
     name = '[^\\\\/]+'
     regexes = {
       :windows => %r!^(([A-Z]:#{slash})|(#{slash}#{slash}#{name}#{slash}#{name})|(#{slash}#{slash}\?#{slash}#{name}))!i,
       :posix   => %r!^/!,
     }
     require 'puppet'
     platform ||= Puppet.features.microsoft_windows? ? :windows : :posix
 
     !! (path =~ regexes[platform])
   end
   module_function :absolute_path?
 
   # Convert a path to a file URI
   def path_to_uri(path)
     return unless path
 
     params = { :scheme => 'file' }
 
     if Puppet.features.microsoft_windows?
       path = path.gsub(/\\/, '/')
 
       if unc = /^\/\/([^\/]+)(\/[^\/]+)/.match(path)
         params[:host] = unc[1]
         path = unc[2]
       elsif path =~ /^[a-z]:\//i
         path = '/' + path
       end
     end
 
     params[:path] = URI.escape(path)
 
     begin
       URI::Generic.build(params)
     rescue => detail
       raise Puppet::Error, "Failed to convert '#{path}' to URI: #{detail}"
     end
   end
   module_function :path_to_uri
 
   # Get the path component of a URI
   def uri_to_path(uri)
     return unless uri.is_a?(URI)
 
     path = URI.unescape(uri.path)
 
     if Puppet.features.microsoft_windows? and uri.scheme == 'file'
       if uri.host
         path = "//#{uri.host}" + path # UNC
       else
         path.sub!(/^\//, '')
       end
     end
 
     path
   end
   module_function :uri_to_path
 
   # Create an exclusive lock.
   def threadlock(resource, type = Sync::EX)
     Puppet::Util.synchronize_on(resource,type) { yield }
   end
 
 
   module_function :benchmark
 
   def memory
     unless defined?(@pmap)
       @pmap = which('pmap')
     end
     if @pmap
       %x{#{@pmap} #{Process.pid}| grep total}.chomp.sub(/^\s*total\s+/, '').sub(/K$/, '').to_i
     else
       0
     end
   end
 
   def symbolize(value)
     if value.respond_to? :intern
       value.intern
     else
       value
     end
   end
 
   def symbolizehash(hash)
     newhash = {}
     hash.each do |name, val|
       if name.is_a? String
         newhash[name.intern] = val
       else
         newhash[name] = val
       end
     end
   end
 
   def symbolizehash!(hash)
     hash.each do |name, val|
       if name.is_a? String
         hash[name.intern] = val
         hash.delete(name)
       end
     end
 
     hash
   end
   module_function :symbolize, :symbolizehash, :symbolizehash!
 
   # Just benchmark, with no logging.
   def thinmark
     seconds = Benchmark.realtime {
       yield
     }
 
     seconds
   end
 
   module_function :memory, :thinmark
 
   # Because IO#binread is only available in 1.9
   def binread(file)
     File.open(file, 'rb') { |f| f.read }
   end
   module_function :binread
 
   # utility method to get the current call stack and format it to a human-readable string (which some IDEs/editors
   # will recognize as links to the line numbers in the trace)
   def self.pretty_backtrace(backtrace = caller(1))
     backtrace.collect do |line|
       file_path, line_num = line.split(":")
       file_path = expand_symlinks(File.expand_path(file_path))
 
       file_path + ":" + line_num
     end .join("\n")
 
   end
 
   # utility method that takes a path as input, checks each component of the path to see if it is a symlink, and expands
   # it if it is.  returns the expanded path.
   def self.expand_symlinks(file_path)
     file_path.split("/").inject do |full_path, next_dir|
       next_path = full_path + "/" + next_dir
       if File.symlink?(next_path) then
         link = File.readlink(next_path)
         next_path =
             case link
               when /^\// then link
               else
                 File.expand_path(full_path + "/" + link)
             end
       end
       next_path
     end
   end
 
   # Replace a file, securely.  This takes a block, and passes it the file
   # handle of a file open for writing.  Write the replacement content inside
   # the block and it will safely replace the target file.
   #
   # This method will make no changes to the target file until the content is
   # successfully written and the block returns without raising an error.
   #
   # As far as possible the state of the existing file, such as mode, is
   # preserved.  This works hard to avoid loss of any metadata, but will result
   # in an inode change for the file.
   #
   # Arguments: `filename`, `default_mode`
   #
   # The filename is the file we are going to replace.
   #
   # The default_mode is the mode to use when the target file doesn't already
   # exist; if the file is present we copy the existing mode/owner/group values
   # across.
   def replace_file(file, default_mode, &block)
     raise Puppet::DevError, "replace_file requires a block" unless block_given?
 
     file     = Pathname(file)
     tempfile = Tempfile.new(file.basename.to_s, file.dirname.to_s)
 
     file_exists = file.exist?
 
     # If the file exists, use its current mode/owner/group. If it doesn't, use
     # the supplied mode, and default to current user/group.
     if file_exists
       if Puppet.features.microsoft_windows?
         mode = Puppet::Util::Windows::Security.get_mode(file.to_s)
         uid = Puppet::Util::Windows::Security.get_owner(file.to_s)
         gid = Puppet::Util::Windows::Security.get_owner(file.to_s)
       else
         stat = file.lstat
 
         mode = stat.mode
         uid = stat.uid
         gid = stat.gid
       end
 
       # We only care about the four lowest-order octets. Higher octets are
       # filesystem-specific.
       mode &= 07777
     else
       mode = default_mode
       uid = Process.euid
       gid = Process.egid
     end
 
     # Set properties of the temporary file before we write the content, because
     # Tempfile doesn't promise to be safe from reading by other people, just
     # that it avoids races around creating the file.
     if Puppet.features.microsoft_windows?
       Puppet::Util::Windows::Security.set_mode(mode, tempfile.path)
       Puppet::Util::Windows::Security.set_owner(uid, tempfile.path)
       Puppet::Util::Windows::Security.set_group(gid, tempfile.path)
     else
       tempfile.chmod(mode)
       tempfile.chown(uid, gid)
     end
 
     # OK, now allow the caller to write the content of the file.
     yield tempfile
 
     # Now, make sure the data (which includes the mode) is safe on disk.
     tempfile.flush
     begin
       tempfile.fsync
     rescue NotImplementedError
       # fsync may not be implemented by Ruby on all platforms, but
       # there is absolutely no recovery path if we detect that.  So, we just
       # ignore the return code.
       #
       # However, don't be fooled: that is accepting that we are running in
       # an unsafe fashion.  If you are porting to a new platform don't stub
       # that out.
     end
 
     tempfile.close
 
     File.rename(tempfile.path, file)
 
     # Ideally, we would now fsync the directory as well, but Ruby doesn't
     # have support for that, and it doesn't matter /that/ much...
 
     # Return something true, and possibly useful.
     file
   end
   module_function :replace_file
 
 
   # Executes a block of code, wrapped with some special exception handling.  Causes the ruby interpreter to
   #  exit if the block throws an exception.
   #
   # @param [String] message a message to log if the block fails
   # @param [Integer] code the exit code that the ruby interpreter should return if the block fails
   # @yield
   def exit_on_fail(message, code = 1)
     yield
-  rescue ArgumentError, RuntimeError, NotImplementedError => detail
-    Puppet.log_exception(detail, "Could not #{message}: #{detail}")
+  # First, we need to check and see if we are catching a SystemExit error.  These will be raised
+  #  when we daemonize/fork, and they do not necessarily indicate a failure case.
+  rescue SystemExit => err
+    raise err
+
+  # Now we need to catch *any* other kind of exception, because we may be calling third-party
+  #  code (e.g. webrick), and we have no idea what they might throw.
+  rescue Exception => err
+    Puppet.log_exception(err, "Could not #{message}: #{err}")
     exit(code)
   end
   module_function :exit_on_fail
 
 
+
+
   #######################################################################################################
   # Deprecated methods relating to process execution; these have been moved to Puppet::Util::Execution
   #######################################################################################################
 
   def execpipe(command, failonfail = true, &block)
     Puppet.deprecation_warning("Puppet::Util.execpipe is deprecated; please use Puppet::Util::Execution.execpipe")
     Puppet::Util::Execution.execpipe(command, failonfail, &block)
   end
   module_function :execpipe
 
   def execfail(command, exception)
     Puppet.deprecation_warning("Puppet::Util.execfail is deprecated; please use Puppet::Util::Execution.execfail")
     Puppet::Util::Execution.execfail(command, exception)
   end
   module_function :execfail
 
   def execute(command, arguments = {})
     Puppet.deprecation_warning("Puppet::Util.execute is deprecated; please use Puppet::Util::Execution.execute")
     Puppet::Util::Execution.execute(command, arguments)
   end
   module_function :execute
 
 end
 end
 
 
 require 'puppet/util/errors'
 require 'puppet/util/methodhelper'
 require 'puppet/util/metaid'
 require 'puppet/util/classgen'
 require 'puppet/util/docs'
 require 'puppet/util/execution'
 require 'puppet/util/logging'
 require 'puppet/util/package'
 require 'puppet/util/warnings'
diff --git a/spec/unit/daemon_spec.rb b/spec/unit/daemon_spec.rb
index 03824bf60..e6b700fb5 100755
--- a/spec/unit/daemon_spec.rb
+++ b/spec/unit/daemon_spec.rb
@@ -1,267 +1,268 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 require 'puppet/daemon'
 require 'puppet/agent'
 
 def without_warnings
   flag = $VERBOSE
   $VERBOSE = nil
   yield
   $VERBOSE = flag
 end
 
 class TestClient
   def lockfile_path
     "/dev/null"
   end
 end
 
 describe Puppet::Daemon, :unless => Puppet.features.microsoft_windows? do
   include PuppetSpec::Files
 
   before do
     @agent = Puppet::Agent.new(TestClient.new)
     @daemon = Puppet::Daemon.new
+    @daemon.stubs(:close_streams).returns nil
   end
 
   it "should be able to manage an agent" do
     @daemon.should respond_to(:agent)
   end
 
   it "should be able to manage a network server" do
     @daemon.should respond_to(:server)
   end
 
   it "should reopen the Log logs when told to reopen logs" do
     Puppet::Util::Log.expects(:reopen)
     @daemon.reopen_logs
   end
 
   describe "when setting signal traps" do
     signals = {:INT => :stop, :TERM => :stop }
     signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs}) unless Puppet.features.microsoft_windows?
     signals.each do |signal, method|
       it "should log and call #{method} when it receives #{signal}" do
         Signal.expects(:trap).with(signal).yields
 
         Puppet.expects(:notice)
 
         @daemon.expects(method)
 
         @daemon.set_signal_traps
       end
     end
   end
 
   describe "when starting" do
     before do
       @daemon.stubs(:create_pidfile)
       @daemon.stubs(:set_signal_traps)
       @daemon.stubs(:run_event_loop)
     end
 
     it "should fail if it has neither agent nor server" do
       lambda { @daemon.start }.should raise_error(Puppet::DevError)
     end
 
     it "should create its pidfile" do
       @daemon.agent = @agent
 
       @daemon.expects(:create_pidfile)
       @daemon.start
     end
 
     it "should start its server if one is configured" do
       server = mock 'server'
       server.expects(:start)
       @daemon.stubs(:server).returns server
 
       @daemon.start
     end
   end
 
   describe "when stopping" do
     before do
       @daemon.stubs(:remove_pidfile)
       Puppet::Util::Log.stubs(:close_all)
       # to make the global safe to mock, set it to a subclass of itself,
       # then restore it in an after pass
       without_warnings { Puppet::Application = Class.new(Puppet::Application) }
     end
 
     after do
       # restore from the superclass so we lose the stub garbage
       without_warnings { Puppet::Application = Puppet::Application.superclass }
     end
 
     it "should stop its server if one is configured" do
       server = mock 'server'
       server.expects(:stop)
       @daemon.stubs(:server).returns server
       expect { @daemon.stop }.to exit_with 0
     end
 
     it 'should request a stop from Puppet::Application' do
       Puppet::Application.expects(:stop!)
       expect { @daemon.stop }.to exit_with 0
     end
 
     it "should remove its pidfile" do
       @daemon.expects(:remove_pidfile)
       expect { @daemon.stop }.to exit_with 0
     end
 
     it "should close all logs" do
       Puppet::Util::Log.expects(:close_all)
       expect { @daemon.stop }.to exit_with 0
     end
 
     it "should exit unless called with ':exit => false'" do
       expect { @daemon.stop }.to exit_with 0
     end
 
     it "should not exit if called with ':exit => false'" do
       @daemon.stop :exit => false
     end
   end
 
   describe "when creating its pidfile" do
     it "should use an exclusive mutex" do
       Puppet.settings.expects(:value).with(:name).returns "me"
       Puppet::Util.expects(:synchronize_on).with("me",Sync::EX)
       @daemon.create_pidfile
     end
 
     it "should lock the pidfile using the Pidlock class" do
       pidfile = mock 'pidfile'
 
       Puppet.settings.stubs(:value).with(:name).returns "eh"
       Puppet.settings.expects(:value).with(:pidfile).returns make_absolute("/my/file")
 
       Puppet::Util::Pidlock.expects(:new).with(make_absolute("/my/file")).returns pidfile
 
       pidfile.expects(:lock).returns true
       @daemon.create_pidfile
     end
 
     it "should fail if it cannot lock" do
       pidfile = mock 'pidfile'
 
       Puppet.settings.stubs(:value).with(:name).returns "eh"
       Puppet.settings.stubs(:value).with(:pidfile).returns make_absolute("/my/file")
 
       Puppet::Util::Pidlock.expects(:new).with(make_absolute("/my/file")).returns pidfile
 
       pidfile.expects(:lock).returns false
 
       lambda { @daemon.create_pidfile }.should raise_error
     end
   end
 
   describe "when removing its pidfile" do
     it "should use an exclusive mutex" do
       Puppet.settings.expects(:value).with(:name).returns "me"
 
       Puppet::Util.expects(:synchronize_on).with("me",Sync::EX)
 
       @daemon.remove_pidfile
     end
 
     it "should do nothing if the pidfile is not present" do
       pidfile = mock 'pidfile', :unlock => false
 
       Puppet[:pidfile] = make_absolute("/my/file")
       Puppet::Util::Pidlock.expects(:new).with(make_absolute("/my/file")).returns pidfile
 
       @daemon.remove_pidfile
     end
 
     it "should unlock the pidfile using the Pidlock class" do
       pidfile = mock 'pidfile', :unlock => true
 
       Puppet[:pidfile] = make_absolute("/my/file")
       Puppet::Util::Pidlock.expects(:new).with(make_absolute("/my/file")).returns pidfile
 
       @daemon.remove_pidfile
     end
   end
 
   describe "when reloading" do
     it "should do nothing if no agent is configured" do
       @daemon.reload
     end
 
     it "should do nothing if the agent is running" do
       @agent.expects(:running?).returns true
 
       @daemon.agent = @agent
 
       @daemon.reload
     end
 
     it "should run the agent if one is available and it is not running" do
       @agent.expects(:running?).returns false
       @agent.expects :run
 
       @daemon.agent = @agent
 
       @daemon.reload
     end
   end
 
   describe "when restarting" do
     before do
       without_warnings { Puppet::Application = Class.new(Puppet::Application) }
     end
 
     after do
       without_warnings { Puppet::Application = Puppet::Application.superclass }
     end
 
     it 'should set Puppet::Application.restart!' do
       Puppet::Application.expects(:restart!)
       @daemon.stubs(:reexec)
       @daemon.restart
     end
 
     it "should reexec itself if no agent is available" do
       @daemon.expects(:reexec)
 
       @daemon.restart
     end
 
     it "should reexec itself if the agent is not running" do
       @agent.expects(:running?).returns false
       @daemon.agent = @agent
       @daemon.expects(:reexec)
 
       @daemon.restart
     end
   end
 
   describe "when reexecing it self" do
     before do
       @daemon.stubs(:exec)
       @daemon.stubs(:stop)
     end
 
     it "should fail if no argv values are available" do
       @daemon.expects(:argv).returns nil
       lambda { @daemon.reexec }.should raise_error(Puppet::DevError)
     end
 
     it "should shut down without exiting" do
       @daemon.argv = %w{foo}
       @daemon.expects(:stop).with(:exit => false)
 
       @daemon.reexec
     end
 
     it "should call 'exec' with the original executable and arguments" do
       @daemon.argv = %w{foo}
       @daemon.expects(:exec).with($0 + " foo")
 
       @daemon.reexec
     end
   end
 end
diff --git a/spec/unit/network/server_spec.rb b/spec/unit/network/server_spec.rb
index 8da5cff60..0b9e73a56 100755
--- a/spec/unit/network/server_spec.rb
+++ b/spec/unit/network/server_spec.rb
@@ -1,409 +1,410 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 require 'puppet/network/server'
 
 describe Puppet::Network::Server do
   before do
     @mock_http_server_class = mock('http server class')
     Puppet.settings.stubs(:use)
     Puppet.settings.stubs(:value).with(:name).returns("me")
     Puppet.settings.stubs(:value).with(:servertype).returns(:suparserver)
     Puppet.settings.stubs(:value).with(:bindaddress).returns("")
     Puppet.settings.stubs(:value).with(:masterport).returns(8140)
     Puppet::Network::HTTP.stubs(:server_class_by_type).returns(@mock_http_server_class)
     Puppet.settings.stubs(:value).with(:servertype).returns(:suparserver)
     @server = Puppet::Network::Server.new(:port => 31337)
+    @server.stubs(:close_streams).returns(nil)
   end
 
   describe "when initializing" do
     before do
       Puppet::Indirector::Indirection.stubs(:model).returns mock('indirection')
       Puppet.settings.stubs(:value).with(:bindaddress).returns("")
       Puppet.settings.stubs(:value).with(:masterport).returns('')
     end
 
     it 'should fail if an unknown option is provided' do
       lambda { Puppet::Network::Server.new(:foo => 31337) }.should raise_error(ArgumentError)
     end
 
     it "should allow specifying a listening port" do
       Puppet.settings.stubs(:value).with(:bindaddress).returns('')
       @server = Puppet::Network::Server.new(:port => 31337)
       @server.port.should == 31337
     end
 
     it "should use the :bindaddress setting to determine the default listening address" do
       Puppet.settings.stubs(:value).with(:masterport).returns('')
       Puppet.settings.expects(:value).with(:bindaddress).returns("10.0.0.1")
       @server = Puppet::Network::Server.new
       @server.address.should == "10.0.0.1"
     end
 
     it "should set the bind address to '127.0.0.1' if the default address is an empty string and the server type is mongrel" do
       Puppet.settings.stubs(:value).with(:servertype).returns("mongrel")
       Puppet.settings.expects(:value).with(:bindaddress).returns("")
       @server = Puppet::Network::Server.new
       @server.address.should == '127.0.0.1'
     end
 
     it "should set the bind address to '0.0.0.0' if the default address is an empty string and the server type is webrick" do
       Puppet.settings.stubs(:value).with(:servertype).returns("webrick")
       Puppet.settings.expects(:value).with(:bindaddress).returns("")
       @server = Puppet::Network::Server.new
       @server.address.should == '0.0.0.0'
     end
 
     it "should use the Puppet configurator to find a default listening port" do
       Puppet.settings.stubs(:value).with(:bindaddress).returns('')
       Puppet.settings.expects(:value).with(:masterport).returns(6667)
       @server = Puppet::Network::Server.new
       @server.port.should == 6667
     end
 
     it "should fail to initialize if no listening port can be found" do
       Puppet.settings.stubs(:value).with(:bindaddress).returns("127.0.0.1")
       Puppet.settings.stubs(:value).with(:masterport).returns(nil)
       lambda { Puppet::Network::Server.new }.should raise_error(ArgumentError)
     end
 
     it "should use the Puppet configurator to determine which HTTP server will be used to provide access to clients" do
       Puppet.settings.expects(:value).with(:servertype).returns(:suparserver)
       @server = Puppet::Network::Server.new(:port => 31337)
       @server.server_type.should == :suparserver
     end
 
     it "should fail to initialize if there is no HTTP server known to the Puppet configurator" do
       Puppet.settings.expects(:value).with(:servertype).returns(nil)
       lambda { Puppet::Network::Server.new(:port => 31337) }.should raise_error
     end
 
     it "should ask the Puppet::Network::HTTP class to fetch the proper HTTP server class" do
       Puppet::Network::HTTP.expects(:server_class_by_type).with(:suparserver).returns(@mock_http_server_class)
       @server = Puppet::Network::Server.new(:port => 31337)
     end
 
     it "should fail if the HTTP server class is unknown" do
       Puppet::Network::HTTP.stubs(:server_class_by_type).returns(nil)
       lambda { Puppet::Network::Server.new(:port => 31337) }.should raise_error(ArgumentError)
     end
 
     it "should allow registering REST handlers" do
       @server = Puppet::Network::Server.new(:port => 31337, :handlers => [ :foo, :bar, :baz])
       lambda { @server.unregister(:foo, :bar, :baz) }.should_not raise_error
     end
 
     it "should not be listening after initialization" do
       Puppet::Network::Server.new(:port => 31337).should_not be_listening
     end
 
     it "should use the :main setting section" do
       Puppet.settings.expects(:use).with { |*args| args.include?(:main) }
       @server = Puppet::Network::Server.new(:port => 31337)
     end
 
     it "should use the :application setting section" do
       #Puppet.settings.expects(:value).with(:name).returns "me"
       Puppet.settings.expects(:use).with { |*args| args.include?(:application) }
 
       @server = Puppet::Network::Server.new(:port => 31337)
     end
   end
 
   # We don't test the method, because it's too much of a Unix-y pain.
   it "should be able to daemonize" do
     @server.should respond_to(:daemonize)
   end
 
   describe "when being started" do
     before do
       @server.stubs(:listen)
       @server.stubs(:create_pidfile)
     end
 
     it "should listen" do
       @server.expects(:listen)
       @server.start
     end
 
     it "should create its PID file" do
       @server.expects(:create_pidfile)
       @server.start
     end
   end
 
   describe "when being stopped" do
     before do
       @server.stubs(:unlisten)
       @server.stubs(:remove_pidfile)
     end
 
     it "should unlisten" do
       @server.expects(:unlisten)
       @server.stop
     end
 
     it "should remove its PID file" do
       @server.expects(:remove_pidfile)
       @server.stop
     end
   end
 
   describe "when creating its pidfile" do
     it "should use an exclusive mutex" do
       Puppet.settings.expects(:value).with(:name).returns "me"
       Puppet::Util.expects(:synchronize_on).with("me",Sync::EX)
       @server.create_pidfile
     end
 
     it "should lock the pidfile using the Pidlock class" do
       pidfile = mock 'pidfile'
 
       Puppet.settings.stubs(:value).with(:name).returns "eh"
       Puppet.settings.expects(:value).with(:pidfile).returns "/my/file"
 
       Puppet::Util::Pidlock.expects(:new).with("/my/file").returns pidfile
 
       pidfile.expects(:lock).returns true
       @server.create_pidfile
     end
 
     it "should fail if it cannot lock" do
       pidfile = mock 'pidfile'
 
       Puppet.settings.stubs(:value).with(:name).returns "eh"
       Puppet.settings.stubs(:value).with(:pidfile).returns "/my/file"
 
       Puppet::Util::Pidlock.expects(:new).with("/my/file").returns pidfile
 
       pidfile.expects(:lock).returns false
 
       lambda { @server.create_pidfile }.should raise_error
     end
   end
 
   describe "when removing its pidfile" do
     it "should use an exclusive mutex" do
       Puppet.settings.expects(:value).with(:name).returns "me"
       Puppet::Util.expects(:synchronize_on).with("me",Sync::EX)
       @server.remove_pidfile
     end
 
     it "should do nothing if the pidfile is not present" do
       pidfile = mock 'pidfile', :unlock => false
       Puppet::Util::Pidlock.expects(:new).with("/my/file").returns pidfile
       Puppet.settings.stubs(:value).with(:pidfile).returns "/my/file"
 
       @server.remove_pidfile
     end
 
     it "should unlock the pidfile using the Pidlock class" do
       pidfile = mock 'pidfile', :unlock => true
       Puppet::Util::Pidlock.expects(:new).with("/my/file").returns pidfile
       Puppet.settings.stubs(:value).with(:pidfile).returns "/my/file"
 
       @server.remove_pidfile
     end
   end
 
   describe "when managing indirection registrations" do
     before do
       Puppet::Indirector::Indirection.stubs(:model).returns mock('indirection')
     end
 
     it "should allow registering an indirection for client access by specifying its indirection name" do
       lambda { @server.register(:foo) }.should_not raise_error
     end
 
     it "should require that the indirection be valid" do
       Puppet::Indirector::Indirection.expects(:model).with(:foo).returns nil
       lambda { @server.register(:foo) }.should raise_error(ArgumentError)
     end
 
     it "should require at least one indirection name when registering indirections for client access" do
       lambda { @server.register }.should raise_error(ArgumentError)
     end
 
     it "should allow for numerous indirections to be registered at once for client access" do
       lambda { @server.register(:foo, :bar, :baz) }.should_not raise_error
     end
 
     it "should allow the use of indirection names to specify which indirections are to be no longer accessible to clients" do
       @server.register(:foo)
       lambda { @server.unregister(:foo) }.should_not raise_error
     end
 
     it "should leave other indirections accessible to clients when turning off indirections" do
       @server.register(:foo, :bar)
       @server.unregister(:foo)
       lambda { @server.unregister(:bar)}.should_not raise_error
     end
 
     it "should allow specifying numerous indirections which are to be no longer accessible to clients" do
       @server.register(:foo, :bar)
       lambda { @server.unregister(:foo, :bar) }.should_not raise_error
     end
 
     it "should not turn off any indirections if given unknown indirection names to turn off" do
       @server.register(:foo, :bar)
       lambda { @server.unregister(:foo, :bar, :baz) }.should raise_error(ArgumentError)
       lambda { @server.unregister(:foo, :bar) }.should_not raise_error
     end
 
     it "should not allow turning off unknown indirection names" do
       @server.register(:foo, :bar)
       lambda { @server.unregister(:baz) }.should raise_error(ArgumentError)
     end
 
     it "should disable client access immediately when turning off indirections" do
       @server.register(:foo, :bar)
       @server.unregister(:foo)
       lambda { @server.unregister(:foo) }.should raise_error(ArgumentError)
     end
 
     it "should allow turning off all indirections at once" do
       @server.register(:foo, :bar)
       @server.unregister
       [ :foo, :bar, :baz].each do |indirection|
         lambda { @server.unregister(indirection) }.should raise_error(ArgumentError)
       end
     end
   end
 
   it "should provide a means of determining whether it is listening" do
     @server.should respond_to(:listening?)
   end
 
   it "should provide a means of determining which HTTP server will be used to provide access to clients" do
     @server.server_type.should == :suparserver
   end
 
   it "should provide a means of determining the listening address" do
     @server.address.should == "127.0.0.1"
   end
 
   it "should provide a means of determining the listening port" do
     @server.port.should == 31337
   end
 
   it "should allow for multiple configurations, each handling different indirections" do
     Puppet::Indirector::Indirection.stubs(:model).returns mock('indirection')
 
     @server2 = Puppet::Network::Server.new(:port => 31337)
     @server.register(:foo, :bar)
     @server2.register(:foo, :xyzzy)
     @server.unregister(:foo, :bar)
     @server2.unregister(:foo, :xyzzy)
     lambda { @server.unregister(:xyzzy) }.should raise_error(ArgumentError)
     lambda { @server2.unregister(:bar) }.should raise_error(ArgumentError)
   end
 
   describe "when listening is off" do
     before do
       @mock_http_server = mock('http server')
       @mock_http_server.stubs(:listen)
       @server.stubs(:http_server).returns(@mock_http_server)
     end
 
     it "should indicate that it is not listening" do
       @server.should_not be_listening
     end
 
     it "should not allow listening to be turned off" do
       lambda { @server.unlisten }.should raise_error(RuntimeError)
     end
 
     it "should allow listening to be turned on" do
       lambda { @server.listen }.should_not raise_error
     end
 
   end
 
   describe "when listening is on" do
     before do
       @mock_http_server = mock('http server')
       @mock_http_server.stubs(:listen)
       @mock_http_server.stubs(:unlisten)
       @server.stubs(:http_server).returns(@mock_http_server)
       @server.listen
     end
 
     it "should indicate that it is listening" do
       @server.should be_listening
     end
 
     it "should not allow listening to be turned on" do
       lambda { @server.listen }.should raise_error(RuntimeError)
     end
 
     it "should allow listening to be turned off" do
       lambda { @server.unlisten }.should_not raise_error
     end
   end
 
   describe "when listening is being turned on" do
     before do
       Puppet::Indirector::Indirection.stubs(:model).returns mock('indirection')
 
       @server = Puppet::Network::Server.new(:port => 31337, :handlers => [:node])
       @mock_http_server = mock('http server')
       @mock_http_server.stubs(:listen)
     end
 
     it "should fetch an instance of an HTTP server" do
       @server.stubs(:http_server_class).returns(@mock_http_server_class)
       @mock_http_server_class.expects(:new).returns(@mock_http_server)
       @server.listen
     end
 
     it "should cause the HTTP server to listen" do
       @server.stubs(:http_server).returns(@mock_http_server)
       @mock_http_server.expects(:listen)
       @server.listen
     end
 
     it "should pass the listening address to the HTTP server" do
       @server.stubs(:http_server).returns(@mock_http_server)
       @mock_http_server.expects(:listen).with do |args|
         args[:address] == '127.0.0.1'
       end
       @server.listen
     end
 
     it "should pass the listening port to the HTTP server" do
       @server.stubs(:http_server).returns(@mock_http_server)
       @mock_http_server.expects(:listen).with do |args|
         args[:port] == 31337
       end
       @server.listen
     end
 
     it "should pass a list of REST handlers to the HTTP server" do
       @server.stubs(:http_server).returns(@mock_http_server)
       @mock_http_server.expects(:listen).with do |args|
         args[:handlers] == [ :node ]
       end
       @server.listen
     end
   end
 
   describe "when listening is being turned off" do
     before do
       @mock_http_server = mock('http server')
       @mock_http_server.stubs(:listen)
       @server.stubs(:http_server).returns(@mock_http_server)
       @server.listen
     end
 
     it "should cause the HTTP server to stop listening" do
       @mock_http_server.expects(:unlisten)
       @server.unlisten
     end
 
     it "should not allow for indirections to be turned off" do
       Puppet::Indirector::Indirection.stubs(:model).returns mock('indirection')
 
       @server.register(:foo)
       lambda { @server.unregister(:foo) }.should raise_error(RuntimeError)
     end
   end
 end