puppet 2.7.26 → 3.0.0.rc4

data/lib/puppet/daemon.rb

@@ -8,7 +8,7 @@ class Puppet::Daemon
   attr_accessor :agent, :server, :argv
 
   def daemonname
-    Puppet[:name]
+    Puppet.run_mode.name
   end
 
   # Put the daemon into the background.
@@ -25,24 +25,36 @@ class Puppet::Daemon
 
     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.err "Could not start #{Puppet.run_mode.name}: #{detail}"
       Puppet::Util::replace_file("/tmp/daemonout", 0644) do |f|
-        f.puts "Could not start #{Puppet[:name]}: #{detail}"
+        f.puts "Could not start #{Puppet.run_mode.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
+    Puppet::Util.synchronize_on(Puppet.run_mode.name,Sync::EX) do
       raise "Could not create PID file: #{pidfile}" unless Puppet::Util::Pidlock.new(pidfile).lock
     end
   end
@@ -72,7 +84,7 @@ class Puppet::Daemon
 
   # Remove the pid file for our daemon.
   def remove_pidfile
-    Puppet::Util.synchronize_on(Puppet[:name],Sync::EX) do
+    Puppet::Util.synchronize_on(Puppet.run_mode.name,Sync::EX) do
       Puppet::Util::Pidlock.new(pidfile).unlock
     end
   end
@@ -123,6 +135,12 @@ class Puppet::Daemon
     # 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 if Puppet[:daemonize]
+
     # Finally, loop forever running events - or, at least, until we exit.
     run_event_loop
   end
@@ -160,7 +178,7 @@ class Puppet::Daemon
       # `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
+        Puppet.settings.reparse_config_files
 
         # The time to the next reparse might have changed, so recalculate
         # now.  That way we react dynamically to reconfiguration.

data/lib/puppet/data_binding.rb

@@ -0,0 +1,11 @@
+require 'puppet/indirector'
+
+# A class for managing data lookups
+class Puppet::DataBinding
+
+  # Set up indirection, so that data can be looked for in the complier
+  extend Puppet::Indirector
+
+  indirects(:data_binding, :terminus_setting => :data_binding_terminus,
+    :doc => "Where to find external data bindings.")
+end

data/lib/puppet/defaults.rb

@@ -1,142 +1,249 @@
 # The majority of Puppet's configuration settings are set in this file.
 module Puppet
-  setdefaults(:main,
-    :confdir => [Puppet.run_mode.conf_dir, "The main Puppet configuration directory.  The default for this setting is calculated based on the user.  If the process
-    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,
-    it defaults to being in the user's home directory."],
-    :vardir => [Puppet.run_mode.var_dir, "Where Puppet stores dynamic and growing data.  The default for this setting is calculated specially, like `confdir`_."],
-    :name => [Puppet.application_name.to_s, "The name of the application, if we are running as one.  The
-      default is essentially $0 without the path or `.rb`."],
-    :run_mode => [Puppet.run_mode.name.to_s, "The effective 'run mode' of the application: master, agent, or user."]
+
+  ############################################################################################
+  # 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.",
+    }
   )
 
-  setdefaults(:main, :logdir => Puppet.run_mode.logopts)
+  define_settings(:main,
+    :logdir => {
+        :default  => nil,
+        :type     => :directory,
+        :mode     => 0750,
+        :owner    => "service",
+        :group    => "service",
+        :desc     => "The directory in which to store log files",
+    }
+  )
 
-  setdefaults(:main,
-    :trace => [false, "Whether to print stack traces on some errors"],
+  define_settings(:main,
+    :trace => {
+        :default  => false,
+        :type     => :boolean,
+        :desc     => "Whether to print stack traces on some errors",
+    },
     :autoflush => {
       :default => true,
-      :desc    => "Whether log files should always flush to disk.",
-      :hook    => proc { |value| Log.autoflush = value }
-    },
-    :syslogfacility => ["daemon", "What syslog facility to use when logging to
-      syslog.  Syslog has a fixed list of valid facilities, and you must
-      choose one of those; you cannot just make one up."],
-    :statedir => { :default => "$vardir/state",
-      :mode => 01755,
-      :desc => "The directory where Puppet state is stored.  Generally,
-        this directory can be removed without causing harm (although it
-        might result in spurious service restarts)."
+      :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 => Puppet.run_mode.run_dir,
-      :mode => 01777,
-      :desc => "Where Puppet PID files are kept."
-    },
-    :genconfig => [false,
-      "Whether to just print a configuration to stdout and exit.  Only makes
-      sense when used interactively.  Takes into account arguments specified
-      on the CLI."],
-    :genmanifest => [false,
-      "Whether to just print a manifest to stdout and exit.  Only makes
-      sense when used interactively.  Takes into account arguments specified
-      on the CLI."],
-    :configprint => ["",
-      "Print the value of a specific configuration setting.  If the name of a
-      setting is provided for this, then the value is printed and puppet
-      exits.  Comma-separate multiple values.  For a list of all values,
-      specify 'all'."],
+      :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 => "ansi",
-      :type    => :setting,
-      :desc    => "Whether to use colors when logging to the console.  Valid values are
-      `ansi` (equivalent to `true`), `html`, and `false`, which produces no color.",
-    },
-    :mkusers => [false,
-      "Whether to create the necessary user and group that puppet agent will
-      run as."],
-    :manage_internal_file_permissions => [true,
-      "Whether Puppet should manage the owner, group, and mode of files
-      it uses internally"
-      ],
-    :onetime => {:default => false,
-      :desc => "Run the configuration once, rather than as a long-running
-      daemon. This is useful for interactively running puppetd.",
-      :short => 'o'
-      },
-    :path => {:default => "none",
-      :desc => "The shell search path.  Defaults to whatever is inherited
-        from the parent process.",
-      :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
-      :hook => proc do |value|
-        ENV["PATH"] = "" if ENV["PATH"].nil?
-        ENV["PATH"] = value unless value == "none"
-        paths = ENV["PATH"].split(File::PATH_SEPARATOR)
-        Puppet::Util::Platform.default_paths.each do |path|
-          ENV["PATH"] += File::PATH_SEPARATOR + path unless paths.include?(path)
+      :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_hook => :on_define_and_write,
+        :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
-        value
-      end
     },
-    :libdir => {:default => "$vardir/lib",
-      :desc => "An extra search path for Puppet.  This is only useful
-        for those files that Puppet will load on demand, and is only
-        guaranteed to work for those cases.  In fact, the autoload
-        mechanism is responsible for making sure this directory
-        is in Ruby's search path",
-      :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
-      :hook => proc do |value|
+    :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_hook => :on_initialize_and_write,
+      :hook             => proc do |value|
         $LOAD_PATH.delete(@oldlibdir) if defined?(@oldlibdir) and $LOAD_PATH.include?(@oldlibdir)
         @oldlibdir = value
         $LOAD_PATH << value
       end
     },
-    :ignoreimport => [false, "If true, allows the parser to continue without requiring
-      all files referenced with `import` statements to exist. This setting was primarily
-      designed for use with commit hooks for parse-checking."],
-    :authconfig => [ "$confdir/namespaceauth.conf",
-      "The configuration file that defines the rights to the different
-      namespaces and methods.  This can be used as a coarse-grained
-      authorization system for both `puppet agent` and `puppet master`."
-    ],
-    :environment => {:default => "production", :desc => "The environment Puppet is running in.  For clients
-      (e.g., `puppet agent`) this determines the environment itself, which
-      is used to find modules and much more.  For servers (i.e., `puppet master`) this provides the default environment for nodes
-      we know nothing about."
-    },
-    :diff_args => ["-u", "Which arguments to pass to the diff command when printing differences between
-      files. The command to use can be chosen with the `diff` setting."],
+    :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
-        has no default value on Windows, as standard `diff` is not available, but Puppet can use many
-        third-party diff tools.",
-    },
-    :show_diff => [false, "Whether to log and report a contextual diff when files are being replaced.  This causes
-      partial file contents to pass through Puppet's normal logging and reporting system, so this setting should be
-      used with caution if you are sending Puppet's reports to an insecure destination.
-      This feature currently requires the `diff/lcs` Ruby library."],
+      :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 => {
-      :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
+        :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 => [4294967290, "The maximum allowed UID.  Some platforms use negative UIDs
-      but then ship with tools that do not know how to handle signed ints, so the UIDs show up as
-      huge numbers that can then not be fed back into the system.  This is a hackish way to fail in a
-      slightly more useful way when that happens."],
-    :route_file => ["$confdir/routes.yaml", "The YAML file containing indirector route configuration."],
-    :node_terminus => ["plain", "Where to find information about nodes."],
-    :catalog_terminus => ["compiler", "Where to get node catalogs.  This is useful to change if, for instance,
-      you'd like to pre-compile catalogs and store them in memcached or some other easily-accessed store."],
+    :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.",
+    },
+    :data_binding_terminus => {
+      :default => "hiera",
+      :desc    => "Where to retrive information about data.",
+    },
+    :hiera_config => {
+      :default => "$confdir/hiera.yaml",
+      :desc    => "The hiera configuration file",
+      :type    => :file,
+    },
+    :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 => Puppet.application_name.to_s == "master" ? 'yaml' : 'facter',
+      :default => 'facter',
       :desc => "The node facts terminus.",
       :hook => proc do |value|
         require 'puppet/node/facts'
@@ -146,86 +253,132 @@ module Puppet
         end
       end
     },
-    :inventory_terminus => [ "$facts_terminus", "Should usually be the same as the facts terminus" ],
-    :httplog => { :default => "$logdir/http.log",
-      :owner => "root",
-      :mode => 0640,
-      :desc => "Where the puppet agent web server logs."
-    },
-    :http_proxy_host => ["none",
-      "The HTTP proxy host to use for outgoing connections.  Note: You
-      may need to use a FQDN for the server hostname when using a proxy."],
-    :http_proxy_port => [3128, "The HTTP proxy port to use for outgoing connections"],
-    :filetimeout => [ 15,
-      "The minimum time to wait (in seconds) between checking for updates in
+    :inventory_terminus => {
+      :default    => "$facts_terminus",
+      :desc       => "Should usually be the same as the facts terminus",
+    },
+    :default_file_terminus => {
+      :default    => "rest",
+      :desc       => "The default source for files if no server is given in a
+      uri, e.g. puppet:///file. The default of `rest` causes the file to be
+      retrieved using the `server` setting. When running `apply` the default
+      is `file_server`, causing requests to be filled locally."
+    },
+    :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 => ["stomp", "Which type of queue to use for asynchronous processing."],
-    :queue_type => ["stomp", "Which type of queue to use for asynchronous processing."],
-    :queue_source => ["stomp://localhost:61613/", "Which type of queue to use for asynchronous processing.  If your stomp server requires
-      authentication, you can include it in the URI as long as your stomp client library is at least 1.1.1"],
-    :async_storeconfigs => {:default => false, :desc => "Whether to use a queueing system to provide asynchronous database integration.
-      Requires that `puppetqd` be running and that 'PSON' support for ruby be installed.",
-      :hook => proc do |value|
-        if value
-          # This reconfigures the terminii for Node, Facts, and Catalog
-          Puppet.settings[:storeconfigs] = true
+      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 `puppet queue` 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"
+            # 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
-      end
     },
-    :thin_storeconfigs => {:default => false, :desc =>
-      "Boolean; whether Puppet should store only facts and exported resources in the storeconfigs
-      database. This will improve the performance of exported resources with the older
-      `active_record` backend, but will disable external tools that search the storeconfigs database.
-      Thinning catalogs is generally unnecessary when using PuppetDB to store catalogs.",
-      :hook => proc do |value|
+    :thin_storeconfigs => {
+      :default  => false,
+      :type     => :boolean,
+      :desc     =>
+    "Boolean; whether Puppet should store only facts and exported resources in the storeconfigs
+    database. This will improve the performance of exported resources with the older
+    `active_record` backend, but will disable external tools that search the storeconfigs database.
+    Thinning catalogs is generally unnecessary when using PuppetDB to store catalogs.",
+      :hook     => proc do |value|
         Puppet.settings[:storeconfigs] = true if value
         end
       },
-    :config_version => ["", "How to determine the configuration version.  By default, it will be the
+    :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 => [true,
-      "Boolean; whether to use the zlib library",
-    ],
-    :prerun_command => ["", "A command to run before every agent run.  If this command returns a non-zero
-      return code, the entire Puppet run will fail."],
-    :postrun_command => ["", "A command to run after every agent run.  If this command returns a non-zero
+      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 => [false, "Freezes the 'main' class, disallowing any code to be added to it.  This
-      essentially means that you can't have any code outside of a node, class, or definition other
-      than in the site manifest."]
+      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.setdefaults(:module_tool,
-    :module_repository  => ['http://forge.puppetlabs.com', "The module repository"],
-    :module_working_dir => ['$vardir/puppet-module', "The directory into which module tool data is stored"]
+  Puppet.define_settings(:module_tool,
+    :module_repository  => {
+      :default  => 'https://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.setdefaults(
+    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
+    :certname => {
+      :default => Puppet::Settings.default_certname.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
+      :call_hook => :on_define_and_write, # 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 => '',
@@ -281,164 +434,262 @@ 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,
       :owner => "service",
       :desc => "Where host certificate requests are stored."
     },
-    :privatekeydir => { :default => "$ssldir/private_keys",
+    :privatekeydir => {
+      :default => "$ssldir/private_keys",
+      :type   => :directory,
       :mode => 0750,
       :owner => "service",
       :desc => "The private key directory."
     },
-    :privatedir => { :default => "$ssldir/private",
+    :privatedir => {
+      :default => "$ssldir/private",
+      :type   => :directory,
       :mode => 0750,
       :owner => "service",
       :desc => "Where the client stores private certificate information."
     },
-    :passfile => { :default => "$privatedir/password",
+    :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",
+    :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",
+    :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",
+    :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",
+    :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",
+    :localcacert => {
+      :default => "$certdir/ca.pem",
+      :type   => :file,
       :mode => 0644,
       :owner => "service",
       :desc => "Where each client stores the CA certificate."
     },
-    :hostcrl => { :default => "$ssldir/crl.pem",
+    ## JJM - The ssl_client_ca_chain setting is commented out because it is
+    # intended for (#3143) and is not expected to be used until CA chaining is
+    # supported.
+    # :ssl_client_ca_chain => {
+    #   :type  => :file,
+    #   :mode  => 0644,
+    #   :owner => "service",
+    #   :desc  => "The list of CA certificate to complete the chain of trust to CA certificates \n" <<
+    #             "listed in the ssl_client_ca_auth file."
+    # },
+    :ssl_client_ca_auth => {
+      :type  => :file,
+      :mode  => 0644,
+      :owner => "service",
+      :desc  => "Certificate authorities who issue server certificates.  SSL servers will not be \n" <<
+                "considered authentic unless they posses a certificate issued by an authority \n" <<
+                "listed in this file.  If this setting has no value then the Puppet master's CA \n" <<
+                "certificate (localcacert) will be used."
+    },
+    ## JJM - The ssl_server_ca_chain setting is commented out because it is
+    # intended for (#3143) and is not expected to be used until CA chaining is
+    # supported.
+    # :ssl_server_ca_chain => {
+    #   :type  => :file,
+    #   :mode  => 0644,
+    #   :owner => "service",
+    #   :desc  => "The list of CA certificate to complete the chain of trust to CA certificates \n" <<
+    #             "listed in the ssl_server_ca_auth file."
+    # },
+    :ssl_server_ca_auth => {
+      :type  => :file,
+      :mode  => 0644,
+      :owner => "service",
+      :desc  => "Certificate authorities who issue client certificates.  SSL clients will not be \n" <<
+                "considered authentic unless they posses a certificate issued by an authority \n" <<
+                "listed in this file.  If this setting has no value then the Puppet master's CA \n" <<
+                "certificate (localcacert) will be used."
+    },
+    :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 => [true, "Whether certificate revocation should be supported by downloading a Certificate Revocation List (CRL)
-      to all clients.  If enabled, CA chaining will almost definitely not work."]
+    :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.",
+    }
   )
 
-    setdefaults(
+    define_settings(
     :ca,
-    :ca_name => ["Puppet CA: $certname", "The name to use the Certificate Authority certificate."],
-    :cadir => {  :default => "$ssldir/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",
+    :cacert => {
+      :default => "$cadir/ca_crt.pem",
+      :type => :file,
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :desc => "The CA certificate."
     },
-    :cakey => { :default => "$cadir/ca_key.pem",
+    :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",
+    :capub => {
+      :default => "$cadir/ca_pub.pem",
+      :type => :file,
       :owner => "service",
       :group => "service",
       :desc => "The CA public key."
     },
-    :cacrl => { :default => "$cadir/ca_crl.pem",
+    :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.warning "Setting the :cacrl to 'false' is deprecated; Puppet will just ignore the crl if yours is missing"
-        end
-      end
     },
-    :caprivatedir => { :default => "$cadir/private",
+    :caprivatedir => {
+      :default => "$cadir/private",
+      :type => :directory,
       :owner => "service",
       :group => "service",
       :mode => 0770,
       :desc => "Where the CA stores private certificate information."
     },
-    :csrdir => { :default => "$cadir/requests",
+    :csrdir => {
+      :default => "$cadir/requests",
+      :type => :directory,
       :owner => "service",
       :group => "service",
       :desc => "Where the CA stores certificate requests"
     },
-    :signeddir => { :default => "$cadir/signed",
+    :signeddir => {
+      :default => "$cadir/signed",
+      :type => :directory,
       :owner => "service",
       :group => "service",
       :mode => 0770,
       :desc => "Where the CA stores signed certificates."
     },
-    :capass => { :default => "$caprivatedir/ca.pass",
+    :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",
+    :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",
+    :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 => [false, "Whether to allow a new certificate
-      request to overwrite an existing certificate."],
-    :ca_days => ["", "How long a certificate should be valid, in days.
-      This setting is deprecated; use `ca_ttl` instead"],
-    :ca_ttl => ["5y", "The default TTL for new certificates; valid values
+    :allow_duplicate_certs => {
+      :default    => false,
+      :type       => :boolean,
+      :desc       => "Whether to allow a new certificate
+      request to overwrite an existing certificate.",
+    },
+    :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 => ["md5", "The type of hash used in certificates."],
-    :req_bits => [4096, "The bit length of the certificates."],
-    :keylength => [4096, "The bit length of keys."],
+      's' (seconds). The unit defaults to seconds.  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",
@@ -448,131 +699,224 @@ EOT
 
   # Define the config default.
 
-    setdefaults(
-    Puppet.settings[:name],
-    :config => ["$confdir/puppet.conf",
-      "The configuration file for #{Puppet[:name]}."],
-    :pidfile => ["$rundir/$name.pid", "The pid file"],
-    :bindaddress => ["", "The address a listening server should bind to.  Mongrel servers
-      default to 127.0.0.1 and WEBrick defaults to 0.0.0.0."],
-    :servertype => {:default => "webrick", :desc => "The type of server to use.  Currently supported
-      options are webrick and mongrel.  If you use mongrel, you will need
-      a proxy in front of the process or processes, since Mongrel cannot
-      speak SSL.",
-
-      :call_on_define => true, # Call our hook with the default value, so we always get the correct bind address set.
-      :hook => proc { |value|  value == "webrick" ? Puppet.settings[:bindaddress] = "0.0.0.0" : Puppet.settings[:bindaddress] = "127.0.0.1" if Puppet.settings[:bindaddress] == "" }
-    }
+    define_settings(:application,
+      :config_file_name => {
+          :type     => :string,
+          :default  => Puppet::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/${run_mode}.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_hook => :on_define_and_write, # Call our hook with the default value, so we always get the correct bind address set.
+        :hook => proc { |value|  value == "webrick" ? Puppet.settings[:bindaddress] = "0.0.0.0" : Puppet.settings[:bindaddress] = "127.0.0.1" if Puppet.settings[:bindaddress] == "" }
+      }
   )
 
-  setdefaults(:master,
-    :user => ["puppet", "The user puppet master should run as."],
-    :group => ["puppet", "The group puppet master should run as."],
-    :manifestdir => ["$confdir/manifests", "Where puppet master looks for its manifests."],
-    :manifest => ["$manifestdir/site.pp", "The entry-point manifest for puppet master."],
-    :code => ["", "Code to parse directly.  This is essentially only used
+  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",
+      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",
+    :masterhttplog => {
+      :default => "$logdir/masterhttp.log",
+      :type => :file,
       :owner => "service",
       :group => "service",
       :mode => 0660,
       :create => true,
       :desc => "Where the puppet master web server logs."
     },
-    :masterport => [8140, "Which port puppet master listens on."],
-    :node_name => ["cert", "How the puppet master determines the client's identity
+    :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)"],
+      reported in its facts)",
+    },
     :bucketdir => {
       :default => "$vardir/bucket",
+      :type => :directory,
       :mode => 0750,
       :owner => "service",
       :group => "service",
       :desc => "Where FileBucket files are stored."
     },
-    :rest_authconfig => [ "$confdir/auth.conf",
-      "The configuration file that defines the rights to the different
+    :rest_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 => [true, "Whether the master should function as a certificate authority."],
+      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",
-      :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 ';'.)",
-      :type => :setting # We don't want this to be considered a file, since it's multiple files.
+      :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 => ["HTTP_X_CLIENT_DN", "The header containing an authenticated
+    :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 => ["HTTP_X_CLIENT_VERIFY", "The header containing the status
+      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."],
+      See http://projects.puppetlabs.com/projects/puppet/wiki/Using_Mongrel for more information.",
+    },
     # To make sure this directory is created before we try to use it on the server, we need
     # it to be in the server section (#1138).
-    :yamldir => {:default => "$vardir/yaml", :owner => "service", :group => "service", :mode => "750",
+    :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", :owner => "service", :group => "service", :mode => "750",
+    :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 => ["store",
-      "The list of reports to generate.  All reports are looked for
-      in `puppet/reports/name.rb`, and multiple report names should be
-      comma-separated (whitespace is okay)."
-    ],
-    :reportdir => {:default => "$vardir/reports",
+    :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 => ["http://localhost:3000/reports/upload",
-      "The URL used by the http reports processor to send reports"],
-    :fileserverconfig => ["$confdir/fileserver.conf", "Where the fileserver configuration is stored."],
-    :strict_hostname_checking => [false, "Whether to only search for the complete
-      hostname as it is in the certificate when searching for node information
-      in the catalogs."]
+    :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.",
+    }
   )
 
-  setdefaults(:metrics,
-    :rrddir => {:default => "$vardir/rrd",
-      :mode => 0750,
-      :owner => "service",
-      :group => "service",
-      :desc => "The directory where RRD database files are stored.
+  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 => ["$runinterval", "How often RRD should expect data.
-      This should match how often the hosts report back to the server."]
+    :rrdinterval => {
+      :default  => "$runinterval",
+      :desc     => "How often RRD should expect data.
+            This should match how often the hosts report back to the server.",
+    }
   )
 
-  setdefaults(:device,
-    :devicedir =>  {:default => "$vardir/devices", :mode => "750", :desc => "The root directory of devices' $vardir"},
-    :deviceconfig => ["$confdir/device.conf","Path to the device config file for puppet device"]
+  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",
+    }
   )
 
-  setdefaults(:agent,
-    :node_name_value => { :default => "$certname",
+  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 => "",
+    :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
@@ -584,57 +928,111 @@ EOT
         end
       end
     },
-    :localconfig => { :default => "$statedir/localconfig",
+    :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",
+    :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", :mode => "750", :desc => "The directory in which client-side YAML data is stored."},
-    :client_datadir => {:default => "$vardir/client_data", :mode => "750", :desc => "The directory in which serialized data is stored on the client."},
-    :classfile => { :default => "$statedir/classes.txt",
+    :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 => 0640,
       :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",
+    :resourcefile => {
+      :default => "$statedir/resources.txt",
+      :type => :file,
       :owner => "root",
       :mode => 0640,
       :desc => "The file in which puppet agent stores a list of the resources
         associated with the retrieved configuration."  },
-    :puppetdlog => { :default => "$logdir/puppetd.log",
+    :puppetdlog => {
+      :default => "$logdir/puppetd.log",
+      :type => :file,
       :owner => "root",
       :mode => 0640,
       :desc => "The log file for puppet agent.  This is generally not used."
     },
-    :server => ["puppet", "The server to which server puppet agent should connect"],
-    :ignoreschedules => [false,
-      "Boolean; whether puppet agent should ignore schedules.  This is useful
-      for initial puppet agent runs."],
-    :puppetport => [8139, "Which port puppet agent listens on."],
-    :noop => [false, "Whether puppet agent should be run in noop mode."],
-    :runinterval => [1800, # 30 minutes
-      "How often puppet agent applies the client configuration; in seconds.
-      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 => [false, "Whether puppet agent should listen for
+    :server => {
+      :default => "puppet",
+      :desc => "The server to which the puppet agent should connect"
+    },
+    :use_srv_records => {
+      :default    => false,
+      :type       => :boolean,
+      :desc       => "Whether the server will search for SRV records in DNS for the current domain.",
+    },
+    :srv_domain => {
+      :default    => "#{Puppet::Settings.domain_fact}",
+      :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 => ["$server", "The server to use for certificate
+      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 => ["$masterport", "The port to use for the certificate authority."],
+      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
@@ -642,271 +1040,418 @@ EOT
         matters on the client, since it asks the server for a specific format.",
       :hook => proc { |value|
         if value
-          Puppet.warning "Setting 'catalog_format' is deprecated; use 'preferred_serialization_format' instead."
+          Puppet.deprecation_warning "Setting 'catalog_format' is deprecated; use 'preferred_serialization_format' instead."
           Puppet.settings[:preferred_serialization_format] = value
         end
       }
     },
-    :preferred_serialization_format => ["pson", "The preferred means of serializing
+    :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 => :setting, # (#2888) Ensure this file is not added to the settings catalog.
-      :desc => "A lock file to temporarily stop puppet agent from doing anything.",
+      classes that support it.",
+    },
+    :agent_pidfile => {
+      :default    => "$statedir/agent.pid",
+    :type         => :file,
+      :desc       => "A lock file to indicate that a puppet agent run is currently in progress.  File contains the pid of the running process.",
     },
-    :usecacheonfailure => [true,
-      "Whether to use the cached configuration when the remote
+    :agent_disabled_lockfile => {
+        :default    => "$statedir/agent_disabled.lock",
+        :type         => :file,
+        :desc       => "A lock file to indicate that puppet agent runs have been administratively disabled.  File contains a JSON object with state information.",
+    },
+    :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 => [false,
-      "Whether to only use the cached catalog rather than compiling a new catalog
+      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 => [false,
-      "Ignore cache and always recompile the configuration.  This is
+      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 => [false, "Whether facts should be made all lowercase when sent to the server."],
-    :dynamicfacts => ["memorysize,memoryfree,swapsize,swapfree",
-      "Facts that are dynamic; these facts will be ignored when deciding whether
+      change or if the server changes.",
+    },
+    :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 => ["$runinterval",
-      "The maximum time to delay before runs.  Defaults to being the same as the
-      run interval."],
-    :splay => [false,
-      "Whether to sleep for a pseudo-random (but consistent) amount of time before
-      a run."],
+      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",
-      :mode => 0750,
-      :desc => "Where FileBucket files are stored locally."
+      :default  => "$vardir/clientbucket",
+      :type     => :directory,
+      :mode     => 0750,
+      :desc     => "Where FileBucket files are stored locally."
     },
-    :configtimeout => [120,
-      "How long the client should wait for the configuration to be retrieved
+    :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
+      many clients contact the server at one time.",
     },
-    :report_server => ["$server",
-      "The server to send transaction reports to."
-    ],
-    :report_port => ["$masterport",
-      "The port to communicate with the report_server."
-    ],
-    :inventory_server => ["$server",
-      "The server to send facts to."
-    ],
-    :inventory_port => ["$masterport",
-      "The port to communicate with the inventory_server."
-    ],
-    :report => [true,
-      "Whether to send reports after every transaction."
-    ],
-    :lastrunfile =>  { :default => "$statedir/last_run_summary.yaml",
-      :mode => 0644,
-      :desc => "Where puppet agent stores the last run report summary in yaml format."
+    :report_server => {
+      :default  => "$server",
+      :desc     => "The server to send transaction reports to.",
     },
-    :lastrunreport =>  { :default => "$statedir/last_run_report.yaml",
-      :mode => 0640,
-      :desc => "Where puppet agent stores the last run report in yaml format."
+    :report_port => {
+      :default  => "$masterport",
+      :desc     => "The port to communicate with the report_server.",
     },
-    :graph => [false, "Whether to create dot graph files for the different
+    :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     => 0640,
+      :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 => ["$statedir/graphs", "Where to store dot-outputted graphs."],
-    :http_compression => [false, "Allow http compression in REST communication with the master.
+      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."]
+      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.",
+    }
   )
 
-  setdefaults(:inspect,
-      :archive_files => [false, "During an inspect run, whether to archive files whose contents are audited to a file bucket."],
-      :archive_file_server => ["$server", "During an inspect run, the file bucket server to archive files to if archive_files is set."]
+  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.
 
-    setdefaults(
+  define_settings(
     :main,
-    :plugindest => ["$libdir",
-      "Where Puppet should store plugins that it pulls down from the central
-      server."],
-    :pluginsource => ["puppet://$server/plugins",
-      "From where to retrieve plugins.  The standard Puppet `file` type
+    :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 => [false, "Whether plugins should be synced with the central server."],
+      be used here.",
+    },
+    :pluginsync => {
+      :default    => true,
+      :type       => :boolean,
+      :desc       => "Whether plugins should be synced with the central server.",
+    },
 
-    :pluginsignore => [".svn CVS .git", "What files to ignore when pulling down plugins."]
+    :pluginsignore => {
+        :default  => ".svn CVS .git",
+        :desc     => "What files to ignore when pulling down plugins.",
+    }
   )
 
   # Central fact information.
 
-    setdefaults(
+    define_settings(
     :main,
-    :factpath => {:default => "$vardir/lib/facter#{File::PATH_SEPARATOR}$vardir/facts",
-      :desc => "Where Puppet should look for facts.  Multiple directories should
+    :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.
-      :type => :setting, # Don't consider it a file, because it could be multiple colon-separated files
-      :hook => proc { |value| Facter.search(value) if Facter.respond_to?(:search) }},
-    :factdest => ["$vardir/facts/",
-      "Where Puppet should store facts that it pulls down from the central
-      server."],
-    :factsource => ["puppet://$server/facts/",
-      "From where to retrieve facts.  The standard Puppet `file` type
-      is used for retrieval, so anything that is a valid file source can
-      be used here."],
-    :factsync => [false, "Whether facts should be synced with the central server."],
-    :factsignore => [".svn CVS", "What files to ignore when pulling down facts."]
+      :call_hook => :on_initialize_and_write, # 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) }}
   )
 
 
-    setdefaults(
+    define_settings(
     :tagmail,
-    :tagmap => ["$confdir/tagmail.conf", "The mapping between reporting tags and email addresses."],
-    :sendmail => [which('sendmail') || '', "Where to find the sendmail binary with which to send email."],
+    :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 => ["report@" + [Facter["hostname"].value, Facter["domain"].value].join("."), "The 'from' email address for the reports."],
-    :smtpserver => ["none", "The server through which to send email reports."]
+    :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.",
+    }
   )
 
-    setdefaults(
+    define_settings(
     :rails,
-    :dblocation => { :default => "$statedir/clientconfigs.sqlite3",
-      :mode => 0660,
-      :owner => "service",
-      :group => "service",
-      :desc => "The database cache for client configurations.  Used for
+    :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 => [ "sqlite3", "The type of database to use." ],
-    :dbmigrate => [ false, "Whether to automatically migrate the database." ],
-    :dbname => [ "puppet", "The name of the database to use." ],
-    :dbserver => [ "localhost", "The database server for caching. Only
-      used when networked databases are used."],
-    :dbport => [ "", "The database password for caching. Only
-      used when networked databases are used."],
-    :dbuser => [ "puppet", "The database user for caching. Only
-      used when networked databases are used."],
-    :dbpassword => [ "puppet", "The database password for caching. Only
-      used when networked databases are used."],
-    :dbconnections => [ '', "The number of database connections for networked
-      databases.  Will be ignored unless the value is a positive integer."],
-    :dbsocket => [ "", "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",
-      :mode => 0600,
-      :owner => "service",
-      :group => "service",
-      :desc => "Where Rails-specific logs are sent"
+    :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 => ["info", "The log level for Rails connections.  The value must be
-      a valid log level within Rails.  Production environments normally use `info`
-      and other environments normally use `debug`."]
+    :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`.",
+    }
   )
 
-    setdefaults(
+    define_settings(
     :couchdb,
 
-    :couchdb_url => ["http://127.0.0.1:5984/puppet", "The url where the puppet couchdb database will be created"]
+    :couchdb_url => {
+        :default  => "http://127.0.0.1:5984/puppet",
+        :desc     => "The url where the puppet couchdb database will be created",
+    }
   )
 
-    setdefaults(
+    define_settings(
     :transaction,
-    :tags => ["", "Tags to use to find resources.  If this is set, then
+    :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 => [false, "Whether each resource should log when it is
+      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 => [false,
-
-      "Whether to print a transaction summary."
-    ]
+      what is being done.",
+    },
+    :summarize => {
+        :default  => false,
+        :type     => :boolean,
+        :desc     => "Whether to print a transaction summary.",
+    }
   )
 
-    setdefaults(
+    define_settings(
     :main,
-    :external_nodes => ["none",
-
-      "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.
+    :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."])
+            This command makes it straightforward to store your node mapping
+            information in other data sources like databases.",
+    }
+    )
 
-        setdefaults(
+        define_settings(
         :ldap,
-    :ldapnodes => [false,
-      "Whether to search for node configurations in LDAP.  See
-      http://projects.puppetlabs.com/projects/puppet/wiki/LDAP_Nodes for more information."],
-    :ldapssl => [false,
-      "Whether SSL should be used when searching for nodes.
+    :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 => [false,
-      "Whether TLS should be used when searching for nodes.
+      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 => ["ldap",
-      "The LDAP server.  Only used if `ldapnodes` is enabled."],
-    :ldapport => [389,
-      "The LDAP port.  Only used if `ldapnodes` is enabled."],
-
-    :ldapstring => ["(&(objectclass=puppetClient)(cn=%s))",
-      "The search string used to find an LDAP node."],
-    :ldapclassattrs => ["puppetclass",
-      "The LDAP attributes to use to define Puppet classes.  Values
-      should be comma-separated."],
-    :ldapstackedattrs => ["puppetvar",
-      "The LDAP attributes that should be stacked to arrays by adding
+      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 => ["all",
-      "The LDAP attributes to include when querying LDAP for nodes.  All
+      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 => ["parentnode",
-      "The attribute to use to define the parent node."],
-    :ldapuser => ["",
-      "The user to use to connect to LDAP.  Must be specified as a
-      full DN."],
-    :ldappassword => ["", "The password to use to connect to LDAP."],
-    :ldapbase => ["",
-      "The search base for LDAP searches.  It's impossible to provide
-      a meaningful default here, although the LDAP libraries might
-      have one already set.  Generally, it should be the 'ou=Hosts'
-      branch under your main directory."]
+      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.",
+    }
   )
 
-  setdefaults(:master,
+  define_settings(:master,
     :storeconfigs => {
-      :default => false,
-      :desc => "Whether to store each client's configuration, including catalogs, facts,
+      :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.
 
@@ -915,7 +1460,7 @@ 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,
+      :call_hook => :on_initialize_and_write,
       :hook => proc do |value|
         require 'puppet/node'
         require 'puppet/node/facts'
@@ -939,32 +1484,27 @@ database from within the Puppet Master process."
 
   # This doesn't actually work right now.
 
-    setdefaults(
+    define_settings(
     :parser,
 
-    :lexical => [false, "Whether to use lexical scoping (vs. dynamic)."],
-    :templatedir => ["$vardir/templates",
-      "Where Puppet looks for template files.  Can be a list of colon-separated
-      directories."
-    ],
-
-    :allow_variables_with_dashes => {
-      :default => false,
-      :desc    => <<-'EOT'
-Permit hyphens (`-`) in variable names and issue deprecation warnings about
-them. This setting **should always be `false`;** setting it to `true`
-will cause subtle and wide-ranging bugs. It will be removed in a future version.
-
-Hyphenated variables caused major problems in the language, but were allowed
-between Puppet 2.7.3 and 2.7.14. If you used them during this window, we
-apologize for the inconvenience --- you can temporarily set this to `true`
-in order to upgrade, and can rename your variables at your leisure. Please
-revert it to `false` after you have renamed all affected variables.
-EOT
+    :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.",
     }
   )
-  setdefaults(
+  define_settings(
     :puppetdoc,
-    :document_all => [false, "Document all resources"]
+    :document_all => {
+        :default  => false,
+        :type     => :boolean,
+        :desc     => "Document all resources",
+    }
   )
 end