puppet 2.6.18 → 2.7.1

data/ext/nagios/naggen

@@ -57,14 +57,21 @@
 #
 #   naggen --storeconfigs --confdir /foo --compare
 #
-# = Author
 #
-# Luke Kanies
+# = License
+#   Copyright 2011 Luke Kanies
 #
-# = Copyright
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
 #
-# Copyright (c) 2009 Puppet Labs, LLC
-# Licensed under the GPL 2
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
 
 require 'puppet'
 require 'puppet/rails'

data/ext/puppet-test

@@ -84,14 +84,20 @@
 #
 #   puppet-test --retrieve /module/path/to/file
 #
-# = Author
+# = License
+#   Copyright 2011 Luke Kanies
 #
-# Luke Kanies
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
 #
-# = Copyright
+#       http://www.apache.org/licenses/LICENSE-2.0
 #
-# Copyright (c) 2005, 2006 Puppet Labs, LLC
-# Licensed under the GNU Public License
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
 
 # Do an initial trap, so that cancels don't get a stack trace.
 trap(:INT) do

data/ext/vim/README

@@ -1,3 +1,2 @@
 To install these files, copy them into ~/.vim, or the relevant
-system-wide location.  To use the ftplugin and indenting, you may need
-to enable them with "filetype plugin indent on" in your vimrc.
+system-wide location.

data/ext/yaml_nodes.rb

@@ -23,14 +23,20 @@
 # yamldir::
 #   Specify where the yaml is found.  Defaults to 'yaml' in the current directory.
 #
-# = Author
+# = License
+#   Copyright 2011 Luke Kanies
 #
-# Luke Kanies
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
 #
-# = Copyright
+#       http://www.apache.org/licenses/LICENSE-2.0
 #
-# Copyright (c) 2009 Puppet Labs, Inc.
-# Licensed under the GPL2
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
 
 require 'yaml'
 require 'optparse'

data/install.rb

@@ -53,18 +53,6 @@ rescue LoadError
   $haverdoc = false
 end
 
-begin
-  if $haverdoc
-    ronn = %x{which ronn}
-    $haveman = true
-  else
-    $haveman = false
-  end
-rescue
-  puts "Missing ronn; skipping man page creation"
-  $haveman = false
-end
-
 PREREQS = %w{openssl facter xmlrpc/client xmlrpc/server cgi}
 MIN_FACTER_VERSION = 1.5
 
@@ -85,7 +73,7 @@ bins  = glob(%w{bin/*})
 rdoc  = glob(%w{bin/* sbin/* lib/**/*.rb README README-library CHANGELOG TODO Install}).reject { |e| e=~ /\.(bat|cmd)$/ }
 ri    = glob(%w{bin/*.rb sbin/* lib/**/*.rb}).reject { |e| e=~ /\.(bat|cmd)$/ }
 man   = glob(%w{man/man[0-9]/*})
-libs  = glob(%w{lib/**/*.rb lib/**/*.py lib/puppet/util/command_line/*})
+libs  = glob(%w{lib/**/*.rb lib/**/*.erb lib/**/*.py lib/puppet/util/command_line/*})
 tests = glob(%w{test/**/*.rb})
 
 def do_configs(configs, target, strip = 'conf/')
@@ -182,15 +170,6 @@ def prepare_installation
   end
 
 
-  if $haveman
-    InstallOptions.man = true
-    if $operatingsystem == "windows"
-      InstallOptions.man  = false
-    end
-  else
-    InstallOptions.man = false
-  end
-
   InstallOptions.tests = true
 
   ARGV.options do |opts|
@@ -202,9 +181,6 @@ def prepare_installation
     opts.on('--[no-]ri', 'Prevents the creation of RI output.', 'Default off on mswin32.') do |onri|
       InstallOptions.ri = onri
     end
-    opts.on('--[no-]man', 'Prevents the creation of man pages.', 'Default on.') do |onman|
-    InstallOptions.man = onman
-    end
     opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|
       InstallOptions.tests = ontest
     end
@@ -237,7 +213,6 @@ def prepare_installation
     end
     opts.on('--full', 'Performs a full installation. All', 'optional installation steps are run.') do |full|
       InstallOptions.rdoc    = true
-      InstallOptions.man     = true
       InstallOptions.ri      = true
       InstallOptions.tests   = true
       InstallOptions.configs = true
@@ -367,33 +342,6 @@ def build_ri(files)
   end
 end
 
-def build_man(bins, sbins)
-  return unless $haveman
-  begin
-    # Locate ronn
-    ronn = %x{which ronn}
-    ronn.chomp!
-    # Create puppet.conf.5 man page
-    %x{bin/puppetdoc --reference configuration > ./man/man5/puppetconf.5.ronn}
-    %x{#{ronn} -r ./man/man5/puppetconf.5.ronn}
-    File.move("./man/man5/puppetconf.5", "./man/man5/puppet.conf.5")
-    File.unlink("./man/man5/puppetconf.5.ronn")
-
-    # Create binary man pages
-    binary = bins + sbins
-    binary.each do |bin|
-      b = bin.gsub( /(bin|sbin)\//, "")
-      %x{#{bin} --help > ./man/man8/#{b}.8.ronn}
-      %x{#{ronn} -r ./man/man8/#{b}.8.ronn}
-      File.unlink("./man/man8/#{b}.8.ronn")
-    end
-
-rescue SystemCallError
-  $stderr.puts "Couldn't build man pages: " + $ERROR_INFO
-  $stderr.puts "Continuing with install..."
-  end
-end
-
 def run_tests(test_list)
     require 'test/unit/ui/console/testrunner'
     $LOAD_PATH.unshift "lib"
@@ -487,7 +435,6 @@ prepare_installation
 #run_tests(tests) if InstallOptions.tests
 #build_rdoc(rdoc) if InstallOptions.rdoc
 #build_ri(ri) if InstallOptions.ri
-#build_man(bins, sbins) if InstallOptions.man
 do_configs(configs, InstallOptions.config_dir) if InstallOptions.configs
 do_bins(sbins, InstallOptions.sbin_dir)
 do_bins(bins, InstallOptions.bin_dir)

data/lib/puppet.rb

@@ -24,7 +24,7 @@ require 'puppet/util/run_mode'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-  PUPPETVERSION = '2.6.18'
+  PUPPETVERSION = '2.7.1'
 
   def Puppet.version
     PUPPETVERSION
@@ -59,7 +59,8 @@ module Puppet
 
   # configuration parameter access and stuff
   def self.[](param)
-    if param == :debug
+    case param
+    when :debug
       return Puppet::Util::Log.level == :debug
     else
       return @@settings[param]
@@ -140,17 +141,12 @@ module Puppet
     end
   end
 
-  # Create a new type.  Just proxy to the Type class.
+  # Create a new type.  Just proxy to the Type class.  The mirroring query
+  # code was deprecated in 2008, but this is still in heavy use.  I suppose
+  # this can count as a soft deprecation for the next dev. --daniel 2011-04-12
   def self.newtype(name, options = {}, &block)
     Puppet::Type.newtype(name, options, &block)
   end
-
-  # Retrieve a type by name.  Just proxy to the Type class.
-  def self.type(name)
-    # LAK:DEP Deprecation notice added 12/17/2008
-    Puppet.warning "Puppet.type is deprecated; use Puppet::Type.type"
-    Puppet::Type.type(name)
-  end
 end
 
 require 'puppet/type'

data/lib/puppet/application.rb

@@ -251,7 +251,8 @@ class Application
 
   # Every app responds to --help
   option("--help", "-h") do |v|
-    help
+    puts help
+    exit
   end
 
   def should_parse_config?
@@ -298,11 +299,12 @@ class Application
 
   # This is the main application entry point
   def run
-    exit_on_fail("initialize")               { hook('preinit')       { preinit } }
-    exit_on_fail("parse options")            { hook('parse_options') { parse_options } }
-    exit_on_fail("parse configuration file") { Puppet.settings.parse } if should_parse_config?
-    exit_on_fail("prepare for execution")    { hook('setup')         { setup } }
-    exit_on_fail("run")                      { hook('run_command')   { run_command } }
+    exit_on_fail("initialize")                                   { hook('preinit')       { preinit } }
+    exit_on_fail("parse options")                                { hook('parse_options') { parse_options } }
+    exit_on_fail("parse configuration file")                     { Puppet.settings.parse } if should_parse_config?
+    exit_on_fail("prepare for execution")                        { hook('setup')         { setup } }
+    exit_on_fail("configure routes from #{Puppet[:route_file]}") { configure_indirector_routes }
+    exit_on_fail("run")                                          { hook('run_command')   { run_command } }
   end
 
   def main
@@ -327,6 +329,15 @@ class Application
     Puppet::Util::Log.newdestination(:syslog) unless options[:setdest]
   end
 
+  def configure_indirector_routes
+    route_file = Puppet[:route_file]
+    if ::File.exists?(route_file)
+      routes = YAML.load_file(route_file)
+      application_routes = routes[name.to_s]
+      Puppet::Indirector.configure_routes(application_routes) if application_routes
+    end
+  end
+
   def parse_options
     # Create an option parser
     option_parser = OptionParser.new(self.class.banner)
@@ -348,14 +359,10 @@ class Application
       end
     end
 
-    # scan command line.
-    begin
-      option_parser.parse!(self.command_line.args)
-    rescue OptionParser::ParseError => detail
-      $stderr.puts detail
-      $stderr.puts "Try 'puppet #{command_line.subcommand_name} --help'"
-      exit(1)
-    end
+    # Scan command line.  We just hand any exceptions to our upper levels,
+    # rather than printing help and exiting, so that we can meaningfully
+    # respond with context-sensitive help if we want to. --daniel 2011-04-12
+    option_parser.parse!(self.command_line.args)
   end
 
   def handlearg(opt, arg)
@@ -386,30 +393,14 @@ class Application
   end
 
   def help
-    if Puppet.features.usage?
-      # RH:FIXME: My goodness, this is ugly.
-      ::RDoc.const_set("PuppetSourceFile", name)
-      #:stopdoc: # Issue #4161
-      def (::RDoc).caller
-        docfile = `grep -l 'Puppet::Application\\[:#{::RDoc::PuppetSourceFile}\\]' #{DOCPATTERN}`.chomp
-        super << "#{docfile}:0"
-      end
-      #:startdoc:
-      ::RDoc::usage && exit
-    else
-      puts "No help available unless you have RDoc::usage installed"
-      exit
-    end
-  rescue Errno::ENOENT
-    puts "No help available for puppet #{name}"
-    exit
+    "No help available for puppet #{name}"
   end
 
   private
 
   def exit_on_fail(message, code = 1)
     yield
-  rescue RuntimeError, NotImplementedError => detail
+  rescue ArgumentError, RuntimeError, NotImplementedError => detail
     puts detail.backtrace if Puppet[:trace]
     $stderr.puts "Could not #{message}: #{detail}"
     exit(code)

data/lib/puppet/application/agent.rb

@@ -83,6 +83,228 @@ class Puppet::Application::Agent < Puppet::Application
     @args[:Port] = arg
   end
 
+  def help
+    <<-HELP
+
+puppet-agent(8) -- The puppet agent daemon
+========
+
+SYNOPSIS
+--------
+Retrieves the client configuration from the puppet master and applies it to
+the local host.
+
+This service may be run as a daemon, run periodically using cron (or something
+similar), or run interactively for testing purposes.
+
+
+USAGE
+-----
+puppet agent  [-D|--daemonize|--no-daemonize] [-d|--debug]
+  [--detailed-exitcodes] [--disable] [--enable] [-h|--help]
+  [--certname <host name>] [-l|--logdest syslog|<file>|console]
+  [-o|--onetime] [--serve <handler>] [-t|--test] [--noop]
+  [--digest <digest>] [--fingerprint] [-V|--version]
+  [-v|--verbose] [-w|--waitforcert <seconds>]
+
+
+DESCRIPTION
+-----------
+This is the main puppet client. Its job is to retrieve the local
+machine's configuration from a remote server and apply it. In order to
+successfully communicate with the remote server, the client must have a
+certificate signed by a certificate authority that the server trusts;
+the recommended method for this, at the moment, is to run a certificate
+authority as part of the puppet server (which is the default). The
+client will connect and request a signed certificate, and will continue
+connecting until it receives one.
+
+Once the client has a signed certificate, it will retrieve its
+configuration and apply it.
+
+
+USAGE NOTES
+-----------
+'puppet agent' does its best to find a compromise between interactive
+use and daemon use. Run with no arguments and no configuration, it will
+go into the background, attempt to get a signed certificate, and retrieve
+and apply its configuration every 30 minutes.
+
+Some flags are meant specifically for interactive use -- in particular,
+'test', 'tags' or 'fingerprint' are useful. 'test' enables verbose
+logging, causes the daemon to stay in the foreground, exits if the
+server's configuration is invalid (this happens if, for instance, you've
+left a syntax error on the server), and exits after running the
+configuration once (rather than hanging around as a long-running
+process).
+
+'tags' allows you to specify what portions of a configuration you want
+to apply. Puppet elements are tagged with all of the class or definition
+names that contain them, and you can use the 'tags' flag to specify one
+of these names, causing only configuration elements contained within
+that class or definition to be applied. This is very useful when you are
+testing new configurations -- for instance, if you are just starting to
+manage 'ntpd', you would put all of the new elements into an 'ntpd'
+class, and call puppet with '--tags ntpd', which would only apply that
+small portion of the configuration during your testing, rather than
+applying the whole thing.
+
+'fingerprint' is a one-time flag. In this mode 'puppet agent' will run
+once and display on the console (and in the log) the current certificate
+(or certificate request) fingerprint. Providing the '--digest' option
+allows to use a different digest algorithm to generate the fingerprint.
+The main use is to verify that before signing a certificate request on
+the master, the certificate request the master received is the same as
+the one the client sent (to prevent against man-in-the-middle attacks
+when signing certificates).
+
+
+OPTIONS
+-------
+Note that any configuration parameter that's valid in the configuration
+file is also a valid long argument. For example, 'server' is a valid
+configuration parameter, so you can specify '--server <servername>' as
+an argument.
+
+See the configuration file documentation at
+http://docs.puppetlabs.com/references/stable/configuration.html for the
+full list of acceptable parameters. A commented list of all
+configuration options can also be generated by running puppet agent with
+'--genconfig'.
+
+* --daemonize:
+  Send the process into the background. This is the default.
+
+* --no-daemonize:
+  Do not send the process into the background.
+
+* --debug:
+  Enable full debugging.
+
+* --digest:
+  Change the certificate fingerprinting digest algorithm. The default is
+  MD5. Valid values depends on the version of OpenSSL installed, but
+  should always at least contain MD5, MD2, SHA1 and SHA256.
+
+* --detailed-exitcodes:
+  Provide transaction information via exit codes. If this is enabled, an
+  exit code of '2' means there were changes, and an exit code of '4'
+  means that there were failures during the transaction. This option
+  only makes sense in conjunction with --onetime.
+
+* --disable:
+  Disable working on the local system. This puts a lock file in place,
+  causing 'puppet agent' not to work on the system until the lock file
+  is removed. This is useful if you are testing a configuration and do
+  not want the central configuration to override the local state until
+  everything is tested and committed.
+
+  'puppet agent' uses the same lock file while it is running, so no more
+  than one 'puppet agent' process is working at a time.
+
+  'puppet agent' exits after executing this.
+
+* --enable:
+  Enable working on the local system. This removes any lock file,
+  causing 'puppet agent' to start managing the local system again
+  (although it will continue to use its normal scheduling, so it might
+  not start for another half hour).
+
+  'puppet agent' exits after executing this.
+
+* --certname:
+  Set the certname (unique ID) of the client. The master reads this
+  unique identifying string, which is usually set to the node's
+  fully-qualified domain name, to determine which configurations the
+  node will receive. Use this option to debug setup problems or
+  implement unusual node identification schemes.
+
+* --help:
+  Print this help message
+
+* --logdest:
+  Where to send messages. Choose between syslog, the console, and a log
+  file. Defaults to sending messages to syslog, or the console if
+  debugging or verbosity is enabled.
+
+* --no-client:
+  Do not create a config client. This will cause the daemon to run
+  without ever checking for its configuration automatically, and only
+  makes sense
+
+* --onetime:
+  Run the configuration once. Runs a single (normally daemonized) Puppet
+  run. Useful for interactively running puppet agent when used in
+  conjunction with the --no-daemonize option.
+
+* --fingerprint:
+  Display the current certificate or certificate signing request
+  fingerprint and then exit. Use the '--digest' option to change the
+  digest algorithm used.
+
+* --serve:
+  Start another type of server. By default, 'puppet agent' will start a
+  service handler that allows authenticated and authorized remote nodes
+  to trigger the configuration to be pulled down and applied. You can
+  specify any handler here that does not require configuration, e.g.,
+  filebucket, ca, or resource. The handlers are in
+  'lib/puppet/network/handler', and the names must match exactly, both
+  in the call to 'serve' and in 'namespaceauth.conf'.
+
+* --test:
+  Enable the most common options used for testing. These are 'onetime',
+  'verbose', 'ignorecache', 'no-daemonize', 'no-usecacheonfailure',
+  'detailed-exit-codes', 'no-splay', and 'show_diff'.
+
+* --noop:
+  Use 'noop' mode where the daemon runs in a no-op or dry-run mode. This
+  is useful for seeing what changes Puppet will make without actually
+  executing the changes.
+
+* --verbose:
+  Turn on verbose reporting.
+
+* --version:
+  Print the puppet version number and exit.
+
+* --waitforcert:
+  This option only matters for daemons that do not yet have certificates
+  and it is enabled by default, with a value of 120 (seconds). This
+  causes 'puppet agent' to connect to the server every 2 minutes 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.
+
+
+EXAMPLE
+-------
+    $ puppet agent --server puppet.domain.com
+
+
+DIAGNOSTICS
+-----------
+
+Puppet agent accepts the following signals:
+
+* SIGHUP:
+  Restart the puppet agent daemon.
+* SIGINT and SIGTERM:
+  Shut down the puppet agent daemon.
+* SIGUSR1: 
+  Immediately retrieve and apply configurations from the puppet master.
+
+AUTHOR
+------
+Luke Kanies
+
+
+COPYRIGHT
+---------
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
+
+    HELP
+  end
+
   def run_command
     return fingerprint if options[:fingerprint]
     return onetime if Puppet[:onetime]
@@ -98,7 +320,7 @@ class Puppet::Application::Agent < Puppet::Application
     unless fingerprint = cert.fingerprint(options[:digest])
       raise ArgumentError, "Could not get fingerprint for digest '#{options[:digest]}'"
     end
-    puts fingerprint
+    Puppet.notice fingerprint
   end
 
   def onetime
@@ -168,8 +390,8 @@ class Puppet::Application::Agent < Puppet::Application
   end
 
   def setup_listen
-    unless FileTest.exists?(Puppet[:rest_authconfig])
-      Puppet.err "Will not start without authorization file #{Puppet[:rest_authconfig]}"
+    unless FileTest.exists?(Puppet[:authconfig])
+      Puppet.err "Will not start without authorization file #{Puppet[:authconfig]}"
       exit(14)
     end
 
@@ -228,9 +450,9 @@ class Puppet::Application::Agent < Puppet::Application
     # access to the local files and we don't need a ca.
     Puppet::SSL::Host.ca_location = options[:fingerprint] ? :none : :remote
 
-    Puppet::Transaction::Report.terminus_class = :rest
+    Puppet::Transaction::Report.indirection.terminus_class = :rest
     # we want the last report to be persisted locally
-    Puppet::Transaction::Report.cache_class = :yaml
+    Puppet::Transaction::Report.indirection.cache_class = :yaml
 
     # Override the default; puppetd needs this, usually.
     # You can still override this on the command-line with, e.g., :compiler.
@@ -239,8 +461,7 @@ class Puppet::Application::Agent < Puppet::Application
     # Override the default.
     Puppet[:facts_terminus] = :facter
 
-    Puppet::Resource::Catalog.cache_class = :yaml
-
+    Puppet::Resource::Catalog.indirection.cache_class = :yaml
 
     # We need tomake the client either way, we just don't start it
     # if --no-client is set.