puppet 0.25.5 → 2.6.0

data/LICENSE

@@ -1,6 +1,6 @@
-Puppet - Automating Configuration Management. Copyright (C) 2005 Puppet Labs LLC
+Puppet - Automating Configuration Management. Copyright (C) 2005 Reductive Labs LLC
 
-Puppet Labs can be contacted at: info@puppetlabs.com
+Reductive Labs can be contacted at: info@reductivelabs.com
 
 This program and entire repository is free software; you can
 redistribute it and/or modify it under the terms of the GNU

data/README

@@ -1,5 +1,9 @@
 Documentation (and detailed install instructions) can be found
-online at http://puppetlabs.com/trac/puppet/wiki/DocumentationStart .
+online at http://docs.puppetlabs.com/.
+
+Additional documentation can also be found at the Puppet Wiki:
+
+http://projects.puppetlabs.com/projects/puppet/wiki/
 
 Generally, you need the following things installed:
 

data/README.queueing

@@ -8,7 +8,7 @@ Queue Daemon).
 Currently this is only supported for "Storeconfigs" which is
 documented at:
 
-http://puppetlabs.com/trac/puppet/wiki/UsingStoredConfiguration
+http://reductivelabs.com/trac/puppet/wiki/UsingStoredConfiguration
 
 In the future this feature can be extended to any new puppet
 data which involves storage in a database.

data/README.rst

@@ -5,8 +5,10 @@ Puppet, an automated administrative engine for your Linux and Unix systems, perf
 administrative tasks (such as adding users, installing packages, and updating server
 configurations) based on a centralized specification.
 
-Documentation (and detailed install instructions) can be found
-online at the `Puppet Wiki`_.
+Documentation (and detailed install instructions) can be found online at the 
+`Puppet Documentation`_ site.
+
+Additional documentation can also be found at the `Puppet Wiki`_.
 
 Installation
 ------------
@@ -31,8 +33,9 @@ Generally, you need the following things installed:
   running 'ruby -rxmlrpc/client -e "puts :yep"'.  If that errors out, you're missing
   the library.
 
-* Facter => 1.1.1
+* Facter => 1.5.1
   You can get this from your package management system or the `Facter site`_
 
-.. _Puppet Wiki: http://puppetlabs.com/trac/puppet/wiki/DocumentationStart
+.. _Puppet Documentation: http://docs.puppetlabs.com
+.. _Puppet Wiki: http://projects.puppetlabs.com/projects/puppet/wiki/
 .. _Facter site: http://puppetlabs.com/projects/facter

data/Rakefile

@@ -5,6 +5,8 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 require 'rake'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
+require 'spec'
+require 'spec/rake/spectask'
 
 module Puppet
     PUPPETVERSION = File.read('lib/puppet.rb')[/PUPPETVERSION *= *'(.*)'/,1] or fail "Couldn't find PUPPETVERSION"
@@ -40,24 +42,10 @@ end
 desc "Create the tarball and the gem - use when releasing"
 task :puppetpackages => [:create_gem, :package]
 
-desc "Run the specs under spec/"
-task :spec do
-    require 'spec'
-    require 'spec/rake/spectask'
-    begin
-#        require 'rcov'
-    rescue LoadError
-    end
-
-    Spec::Rake::SpecTask.new do |t|
-        t.spec_opts = ['--format','s', '--loadby','mtime']
-        t.spec_files = FileList['spec/**/*.rb']
-        t.fail_on_error = false
-        if defined?(Rcov)
-            t.rcov = true
-            t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*']
-        end
-     end
+Spec::Rake::SpecTask.new do |t|
+    t.spec_opts = ['--format','s', '--loadby','mtime','--color']
+    t.pattern ='spec/{unit,integration}/**/*.rb'
+    t.fail_on_error = false
 end
 
 desc "Run the unit tests"

data/bin/filebucket

@@ -1,99 +1,5 @@
 #!/usr/bin/env ruby
 
-#
-# = Synopsis
-#
-# A stand-alone Puppet filebucket client.
-#
-# = Usage
-#
-#   filebucket [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
-#      [-l|--local] [-r|--remote]
-#      [-s|--server <server>] [-b|--bucket <directory>] <file> <file> ...
-#
-# = Description
-#
-# This is a stand-alone filebucket client for sending files to a local
-# or central filebucket.
-#
-# = Usage
-#
-# This client can operate in three modes, with only one mode per call:
-#
-# backup::
-#   Send one or more files to the specified file bucket.  Each sent file
-#   is printed with its resulting md5 sum.
-#
-# get::
-#   Return the text associated with an md5 sum.  The text is printed to
-#   stdout, and only one file can be retrieved at a time.
-#
-# restore::
-#   Given a file path and an md5 sum, store the content associated with the
-#   sum into the specified file path.  You can specify an entirely new path
-#   to this argument; you are not restricted to restoring the content to its
-#   original location.
-#
-# Note that +filebucket+ defaults to using a network-based filebucket available on
-# the server named +puppet+.  To use this, you'll have to be running as a user
-# with valid Puppet certificates.  Alternatively, you can use your local file bucket
-# by specifying +--local+.
-#
-# = Example
-#
-#   $ filebucket backup /etc/passwd
-#   /etc/passwd: 429b225650b912a2ee067b0a4cf1e949
-#   $ filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
-#   $
-#
-# = Options
-#
-# Note that any configuration parameter that's valid in the configuration file
-# is also a valid long argument.  For example, 'ssldir' is a valid configuration
-# parameter, so you can specify '--ssldir <directory>' as an argument.
-#
-# See the configuration file documentation at
-# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
-# the full list of acceptable parameters. A commented list of all
-# configuration options can also be generated by running puppet with
-# '--genconfig'.
-#
-# debug::
-#   Enable full debugging.
-#
-# help::
-#   Print this help message
-#
-# local::
-#   Use the local filebucket.  This will use the default configuration
-#   information.
-#
-# remote::
-#   Use a remote filebucket.  This will use the default configuration
-#   information.
-#
-# server::
-#   The server to send the file to, instead of locally.
-#
-# verbose::
-#   Print extra information.
-#
-# version::
-#   Print version information.
-#
-# = Example
-#
-#   filebucket -b /tmp/filebucket /my/file
-#
-# = Author
-#
-# Luke Kanies
-#
-# = Copyright
-#
-# Copyright (c) 2005 Puppet Labs, LLC
-# Licensed under the GNU Public License
-
 require 'puppet/application'
 require 'puppet/application/filebucket'
 

data/bin/pi

@@ -1,50 +1,5 @@
 #!/usr/bin/env ruby
 
-#
-# = Synopsis
-#
-# Print help about puppet types on the console. Run with '-h' to get detailed
-# help.
-# = Usage
-#
-#   pi [-h|--help] [-s|--short] [-p|--providers] [-l|--list] [-m|--meta] 
-#
-# = Description
-#
-# Prints details of Puppet types, providers and metaparameters on the console.
-#
-# = Options
-#
-# help::
-#   Print this help text
-#
-# providers::
-#   Describe providers in detail for each type
-#
-# list::
-#   List all types
-#
-# meta::
-#   List all metaparameters
-#
-# short::
-#   List only parameters without detail 
-#
-# = Example
-#
-#   pi --list
-#   pi file --providers
-#   pi user -s -m
-#
-# = Author
-#
-# David Lutterkort
-#
-# = Copyright
-#
-# Copyright (c) 2005 Puppet Labs, LLC
-# Licensed under the GNU Public License
+require 'puppet/application/describe'
 
-require 'puppet/application/pi'
-
-Puppet::Application[:pi].run
+Puppet::Application[:describe].run

data/bin/puppet

@@ -1,71 +1,4 @@
 #!/usr/bin/env ruby
 
-#
-# = Synopsis
-#
-# Run a stand-alone +puppet+ manifest.
-#
-# = Usage
-#
-#   puppet [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] [-e|--execute]
-#               [--detailed-exitcodes] [-l|--logdest <file>] <file>
-#
-# = Description
-#
-# This is the standalone puppet execution tool; use it to execute
-# individual manifests that you write.  If you need to execute site-wide
-# manifests, use +puppetd+ and +puppetmasterd+.
-#
-# = Options
-#
-# Note that any configuration parameter that's valid in the configuration file
-# is also a valid long argument.  For example, 'ssldir' is a valid configuration
-# parameter, so you can specify '--ssldir <directory>' as an argument.
-#
-# See the configuration file documentation at
-# http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
-# the full list of acceptable parameters. A commented list of all
-# configuration options can also be generated by running puppet with
-# '--genconfig'.
-#
-# debug::
-#   Enable full debugging.
-#
-# 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.
-#
-# help::
-#   Print this help message
-#
-# loadclasses::
-#   Load any stored classes.  +puppetd+ caches configured classes (usually at
-#   /etc/puppet/classes.txt), and setting this option causes all of those classes
-#   to be set in your +puppet+ manifest.
-#
-# logdest::
-#   Where to send messages.  Choose between syslog, the console, and a log file.
-#   Defaults to sending messages to the console.
-#
-# execute::  
-#   Execute a specific piece of Puppet code 
-#  
-# verbose::
-#   Print extra information.
-#
-# = Example
-#
-#   puppet -l /tmp/manifest.log manifest.pp
-#
-# = Author
-#
-# Luke Kanies
-#
-# = Copyright
-#
-# Copyright (c) 2005 Puppet Labs, LLC
-# Licensed under the GNU Public License
-
-require 'puppet/application/puppet'
-Puppet::Application[:puppet].run
+require 'puppet/util/command_line'
+Puppet::Util::CommandLine.new.execute

data/bin/puppetca

@@ -1,102 +1,4 @@
 #!/usr/bin/env ruby
 
-#
-# = Synopsis
-#
-# Stand-alone certificate authority.  Capable of generating certificates
-# but mostly meant for signing certificate requests from puppet clients.
-#
-# = Usage
-#
-#   puppetca [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
-#               [-g|--generate] [-l|--list] [-s|--sign] [-r|--revoke]
-#               [-p|--print] [-c|--clean] [--verify] [host]
-#
-# = Description
-#
-# Because the puppetmasterd daemon defaults to not signing client certificate
-# requests, this script is available for signing outstanding requests.  It
-# can be used to list outstanding requests and then either sign them individually
-# or sign all of them.
-#
-# = Options
-#
-# Note that any configuration parameter that's valid in the configuration file
-# is also a valid long argument.  For example, 'ssldir' is a valid configuration
-# parameter, so you can specify '--ssldir <directory>' as an argument.
-#
-# See the configuration file documentation at
-# http://puppetlabs.com/projects/puppet/reference/configref.html for
-# the full list of acceptable parameters. A commented list of all
-# configuration options can also be generated by running puppetca with
-# '--genconfig'.
-#
-# all::
-#   Operate on all items.  Currently only makes sense with '--sign',
-#   '--clean', or '--list'.
-#
-# clean::
-#    Remove all files related to a host from puppetca's storage. This is
-#    useful when rebuilding hosts, since new certificate signing requests
-#    will only be honored if puppetca does not have a copy of a signed
-#    certificate for that host. The certificate of the host remains valid.
-#    If '--all' is specified then all host certificates, both signed and
-#    unsigned, will be removed.
-#
-# debug::
-#   Enable full debugging.
-#
-# generate::
-#   Generate a certificate for a named client.  A certificate/keypair will be
-#   generated for each client named on the command line.
-#
-# help::
-#   Print this help message
-#
-# list::
-#   List outstanding certificate requests.  If '--all' is specified,
-#   signed certificates are also listed, prefixed by '+', and revoked
-#   or invalid certificates are prefixed by '-' (the verification outcome
-#   is printed in parenthesis).
-#
-# print::
-#   Print the full-text version of a host's certificate.
-#
-# revoke::
-#   Revoke the certificate of a client. The certificate can be specified
-#   either by its serial number, given as a decimal number or a hexadecimal
-#   number prefixed by '0x', or by its hostname. The certificate is revoked
-#   by adding it to the Certificate Revocation List given by the 'cacrl'
-#   config parameter. Note that the puppetmasterd needs to be restarted
-#   after revoking certificates.
-#
-# sign::
-#   Sign an outstanding certificate request.  Unless '--all' is specified,
-#   hosts must be listed after all flags.
-#
-# verbose::
-#   Enable verbosity.
-#
-# version::
-#   Print the puppet version number and exit.
-#
-# verify::
-#   Verify the named certificate against the local CA certificate.
-#
-# = Example
-#
-#   $ puppetca -l
-#   culain.madstop.com
-#   $ puppetca -s culain.madstop.com
-#
-# = Author
-#
-# Luke Kanies
-#
-# = Copyright
-#
-# Copyright (c) 2005 Puppet Labs, LLC
-# Licensed under the GNU Public License
-
-require 'puppet/application/puppetca'
-Puppet::Application[:puppetca].run
+require 'puppet/application/cert'
+Puppet::Application[:cert].run

data/bin/puppetd

@@ -1,160 +1,4 @@
 #!/usr/bin/env ruby
-# == Synopsis
-#
-# Retrieve the client configuration from the central puppet server and apply
-# it to the local host.
-#
-# Currently must be run out periodically, using cron or something similar.
-#
-# = Usage
-#
-#   puppetd  [-D|--daemonize|--no-daemonize] [-d|--debug] [--disable] [--enable]
-#       [-h|--help] [--fqdn <host name>] [-l|--logdest syslog|<file>|console]
-#       [-o|--onetime] [--serve <handler>] [-t|--test] [--noop]
-#       [-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
-#
-# +puppetd+ 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
-# backgroun, 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+ and +tags+ 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.
-#
-# = 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://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
-# the full list of acceptable parameters. A commented list of all
-# configuration options can also be generated by running puppetd 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.
-#
-# disable::
-#   Disable working on the local system.  This puts a lock file in place,
-#   causing +puppetd+ 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.
-#
-#   +puppetd+ uses the same lock file while it is running, so no more than one
-#   +puppetd+ process is working at a time.
-#
-#   +puppetd+ exits after executing this.
-#
-# enable::
-#   Enable working on the local system.  This removes any lock file, causing
-#   +puppetd+ 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).
-#
-#   +puppetd+ exits after executing this.
-#
-# fqdn::
-#   Set the fully-qualified domain name of the client.  This is only used for
-#   certificate purposes, but can be used to override the discovered hostname.
-#   If you need to use this flag, it is generally an indication of a setup problem.
-#
-# 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 when used in conjunction with --listen.
-#
-# onetime::
-#   Run the configuration once. Runs a single daemonized Puppet run. Useful for 
-#   interactively running puppetd and hence used in conjunction with the --no-daemonize 
-#   option.
-#
-# serve::
-#   Start another type of server.  By default, +puppetd+ 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+, and +no-usecacheonfailure+.
-#
-# 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
-#   +puppetd+ 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
-#
-#   puppetd --server puppet.domain.com
-#
-# = Author
-#
-# Luke Kanies
-#
-# = Copyright
-#
-# Copyright (c) 2005, 2006 Puppet Labs, LLC
-# Licensed under the GNU Public License
 
-require 'puppet/application/puppetd'
-Puppet::Application[:puppetd].run
+require 'puppet/application/agent'
+Puppet::Application[:agent].run