puppet 0.22.4 → 0.23.0

data/CHANGELOG

@@ -1,3 +1,159 @@
+    Modified the fileserver to cache file information, so that
+    each file isn't being read on every connection.  Also,
+    added londo's patch from #678 to avoid reading entire files
+    into memory.
+
+    Fixed environment handling in the crontab provider (#669).
+
+    Added patch by trombik in #572, supporting old-style
+    freebsd init scripts with '.sh' endings.
+
+    Added fink package provider (#642), as provided by 'do'.
+
+    Marked the dpkg package provider as versionable (#647).
+
+    Applied patches by trombik to fix FreeBSD ports (#624 and #628).
+
+    Fixed the CA server so that it refuses to send back a certificate
+    whose public key doesn't match the CSR.  Instead, it tells the
+    user to run 'puppetca --clean'.
+
+    Invalid certificates are no longer written to disk (#578).
+
+    Added a package provider (appdmg) able to install .app packages
+    on .dmg files on OS X (#641).
+
+    Applied the patch from #667 to hopefully kill the client hanging
+    problems (permanently, this time).
+
+    Fixed functions so that they accept most other rvalues as valid values
+    (#548).
+
+    COMPATIBILITY ALERT:
+    Significantly reworked external node support, in a way that's NOT
+    backward-compatible:
+
+        Only ONE node source can be used -- you can use LDAP, code, or
+        an external node program, but not more than one.
+    
+        LDAP node support has two changes:  First, the "ldapattrs" attribute is
+        now used for setting the attributes to retrieve from the server (in
+        addition to required attriutes), and second, all retrieved attributes
+        are set as variables in the top scope.  This means you can set attributes
+        on your LDAP nodes and they will automatically appear as variables
+        in your configurations.
+
+        External node support has been completely rewritten.  These programs must
+        now generate a YAML dump of a hash, with "classes" and "parameters" keys.
+        The classes should be an array, and the parameters should be a hash.  The
+        external node program has no support for parent nodes -- the script must
+        handle that on its own.
+
+    Reworked the database schema used to store configurations with the
+    storeconfigs option.  
+    
+    Replaced the obsolete RRD ruby library with the maintained
+    RubyRRDtool library (which requires rrdtool2) (#659).
+
+    The Portage package provider now calls eix-update automatically
+    when eix's database is absent or out of sync (#666).
+
+    Mounts now correctly handle existing fstabs with no pass or dump values
+    (#550).
+
+    Mounts now default to 0 for pass and dump (#112).
+
+    Added urpmi support (#592).
+
+    Finishing up the type => provider interface work.  Basically, package
+    providers now return lists of provider instances.  In the proces,
+    I rewrote the interface between package types and providers, and also
+    enabled prefetching on all packages.  This should significantly speed
+    up most package operations.
+
+    Hopefully fixing the file descriptor/open port problems, with patches
+    from Valentin Vidic.
+
+    Significantly reworked the type => provider interface with respect to
+    listing existing provider instances.  The class method on both
+    class heirarchies has been renamed to 'instances', to start.  Providers
+    are now expected to return provider instances, instead of creating
+    resources, and the resource's 'instances' method is expected to
+    find the matching resource, if any, and set the resource's
+    provider appropriately.  This *significantly* reduces the reliance on
+    effectively global state (resource references in the resource classes).
+    This global state will go away soon.
+
+    Along with this change, the 'prefetch' class method on providers now
+    accepts the list of resources for prefetching.  This again reduces
+    reliance on global state, and makes the execution path much easier
+    to follow.
+
+    Fixed #532 -- reparsing config files now longer throws an exception.
+
+    Added some warnings and logs to the service type so
+    users will be encouraged to specify either "ensure"
+    or "enabled" and added debugging to indicate why
+    restarting is skipped when it is.
+
+    Changed the location of the classes.txt to the state
+    directory.
+
+    Added better error reporting on unmatched brackets.
+
+    Moved puppetd and puppetmasterd to sbin in svn and fixed install.rb
+    to copy them into sbin on the local system appropriately.  (#323)
+
+    Added a splay option (#501).  It's disabled when running under
+    --test in puppetd.  The value is random but cached.  It defaults
+    to the runinterval but can be tuned with --splaylimit
+
+    Changing the notify type so that it always uses
+    the loglevel.
+
+    Fixing #568 - nodes can inherit from quoted node names.
+
+    Tags (and thus definitions and classes) can now be a single
+    character. (#566)
+
+    Added an 'undef' keyword (#629), which will evaluate to ""
+    within strings but when used as a resource parameter value
+    will cause that parameter to be evaluated as undefined.
+
+    Changed the topological sort algorithm (#507) so it will always
+    fail on cycles.
+
+    Added a 'dynamicfacts' configuration option; any facts in that
+    comma-separated list will be ignored when comparing facts to 
+    see if they have changed and thus whether a recompile is necessary.
+
+    Renamed some poorly named internal variables:
+        @models in providers are now either @resource or
+        @resource_type (#605).
+
+        @children is no longer used except by components (#606).
+
+        @parent is now @resource within parameters (#607).
+
+    The old variables are still set for backward compatibility.
+
+    Significantly reworking configuration parsing.  Executables all now
+    look for 'puppet.conf' (#206), although they will parse the old-style
+    configuration files if they are present, although they throw a deprecation
+    warning.  Also, file parameters (owner, mode, group) are now set on the
+    same line as the parameter, in brackets. (#422)
+
+    Added transaction summaries (available with the --summarize option),
+    useful for getting a quick idea of what happened in a transaction.
+    Currently only useful on the client or with the puppet interpreter.
+
+    Changed the interal workings for retrieve and removed the :is attribute
+    from Property.  The retrieve methods now return the current value of
+    the property for the system.
+
+    Removed acts_as_taggable from the rails models.
+
+0.22.4
     Execs now autorequire the user they run as, as long as the user
     is specified by name. (#430)
 

data/README

@@ -22,6 +22,6 @@ Generally, you need the following things installed:
   the library.
 
 * Facter => 1.1.1
-  You can get this from http://reductivelabs.com/projects/facter
+  You can get this from < http://reductivelabs.com/projects/facter >
 
-$Id: README 2113 2007-01-29 18:32:46Z ajax $
+$Id: README 2549 2007-06-03 19:36:02Z ajax $

data/Rakefile

@@ -28,13 +28,13 @@ project = Rake::RedLabProject.new("puppet") do |p|
         'examples/**/*',
         'conf/**/*'
     ]
-    p.filelist.exclude("bin/pi", "bin/ralsh", "bin/filebucket")
+    p.filelist.exclude("bin/pi")
 
     p.add_dependency('facter', '1.1.0')
 
     #p.epmhosts = %w{culain}
-    p.sunpkghost = "sol10b"
-    p.rpmhost = "fedora1"
+    #p.sunpkghost = "sol10b"
+    #p.rpmhost = "fedora1"
 end
 
 if project.has?(:gem)
@@ -45,7 +45,7 @@ if project.has?(:gem)
 
         task.bindir = "bin"                               # Use these for applications.
         task.executables = ["puppet", "puppetd", "puppetmasterd", "puppetdoc",
-                         "puppetca"]
+                         "puppetca", "puppetrun", "ralsh"]
         task.default_executable = "puppet"
         task.autorequire = 'puppet'
 
@@ -111,7 +111,7 @@ def daily(package)
 end
 
 def downdir
-    ENV['DOWNLOAD_DIR'] || "/export/docroots/reductivelabs.com/htdocs/downloads"
+    ENV['DOWNLOAD_DIR'] || "/opt/rl/docroots/reductivelabs.com/htdocs/downloads"
 end
 
 def stamp
@@ -138,4 +138,4 @@ task :dailyclean do
     end
 end
 
-# $Id: Rakefile 2354 2007-03-26 17:19:24Z luke $
+# $Id: Rakefile 2630 2007-06-19 23:11:10Z luke $

data/bin/filebucket

@@ -0,0 +1,212 @@
+#!/usr/bin/env ruby
+
+#
+# = Synopsis
+#
+# A stand-alone Puppet filebucket client.
+#
+# = Usage
+#
+#   pbucket [-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 +pbucket+ 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
+#
+#   $ pbucket backup /etc/passwd
+#   /etc/passwd: 429b225650b912a2ee067b0a4cf1e949
+#   $ pbucket 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://reductivelabs.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 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
+#
+#   pbucket -b /tmp/filebucket /my/file
+#
+# = Author
+#
+# Luke Kanies
+#
+# = Copyright
+#
+# Copyright (c) 2005 Reductive Labs, LLC
+# Licensed under the GNU Public License
+
+require 'puppet'
+require 'puppet/network/client'
+require 'getoptlong'
+
+options = [
+    [ "--bucket",   "-b",			GetoptLong::REQUIRED_ARGUMENT ],
+    [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
+    [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
+    [ "--local",	"-l",			GetoptLong::NO_ARGUMENT ],
+    [ "--remote",	"-r",			GetoptLong::NO_ARGUMENT ],
+    [ "--verbose",  "-v",			GetoptLong::NO_ARGUMENT ],
+    [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
+]
+
+# Add all of the config parameters as valid options.
+Puppet.config.addargs(options)
+
+result = GetoptLong.new(*options)
+
+options = {}
+
+begin
+    result.each { |opt,arg|
+        case opt
+            when "--version"
+                puts "%s" % Puppet.version
+                exit
+            when "--help"
+                if Puppet.features.usage?
+                    RDoc::usage && exit
+                else
+                    puts "No help available unless you have RDoc::usage installed"
+                    exit
+                end
+            when "--bucket"
+                options[:bucket] = arg
+            when "--verbose"
+                options[:verbose] = true
+            when "--debug"
+                options[:debug] = true
+            when "--local"
+                options[:local] = true
+            when "--remote"
+                options[:remote] = true
+            else
+                Puppet.config.handlearg(opt, arg)
+        end
+    }
+rescue GetoptLong::InvalidOption => detail
+    $stderr.puts "Try '#{$0} --help'"
+    exit(1)
+end
+
+Puppet::Log.newdestination(:console)
+
+client = nil
+server = nil
+
+Puppet.settraps
+
+if options[:debug]
+    Puppet::Log.level = :debug
+elsif options[:verbose]
+    Puppet::Log.level = :info
+end
+
+# Now parse the config
+Puppet.parse_config
+
+Puppet.genconfig
+Puppet.genmanifest
+
+begin
+    if options[:local] or options[:bucket]
+        path = options[:bucket] || Puppet[:bucketdir]
+        client = Puppet::Network::Client.dipper.new(:Path => path)
+    else
+        require 'puppet/network/handler'
+        client = Puppet::Network::Client.dipper.new(:Server => Puppet[:server])
+    end
+rescue => detail
+    $stderr.puts detail
+    if Puppet[:trace]
+        puts detail.backtrace
+    end
+    exit(1)
+end
+
+mode = ARGV.shift
+case mode
+when "get":
+    md5 = ARGV.shift
+    out = client.getfile(md5)
+    print out
+when "backup":
+    ARGV.each do |file|
+        unless FileTest.exists?(file)
+            $stderr.puts "%s: no such file" % file
+            next
+        end
+        unless FileTest.readable?(file)
+            $stderr.puts "%s: cannot read file" % file
+            next
+        end
+        md5 = client.backup(file)
+        puts "%s: %s" % [file, md5]
+    end
+when "restore":
+    file = ARGV.shift
+    md5 = ARGV.shift
+    client.restore(file, md5)
+else
+    raise "Invalid mode %s" % mode
+end
+
+# $Id: filebucket 2464 2007-05-06 05:42:53Z luke $

data/bin/puppet

@@ -132,6 +132,8 @@ rescue GetoptLong::InvalidOption => detail
     exit(1)
 end
 
+Puppet.parse_config
+
 unless logset
     Puppet::Util::Log.newdestination(:console)
 end

data/bin/puppetca

@@ -152,9 +152,7 @@ rescue GetoptLong::InvalidOption => detail
 end
 
 # Now parse the config
-if Puppet[:config] and File.exists? Puppet[:config]
-    Puppet.config.parse(Puppet[:config])
-end
+Puppet.parse_config
 
 Puppet.genconfig
 Puppet.genmanifest
@@ -278,4 +276,4 @@ else
     exit(42)
 end
 
-# $Id: puppetca 2391 2007-04-17 18:54:52Z luke $
+# $Id: puppetca 2464 2007-05-06 05:42:53Z luke $

data/bin/puppetd

@@ -34,7 +34,7 @@
 # configuration every 30 minutes.
 #
 # Some flags are meant specifically for interactive use -- in particular,
-# +test+ and +tags+ are useful.  +test+ enables verobse logging, causes
+# +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
@@ -111,11 +111,12 @@
 #   useful for interactively running puppetd.
 #
 # serve::
-#   Start another type of server.  By default default, +puppetd+ will start
-#   a server that allows authenticated and authorized remote nodes to trigger
-#   the configuration to be pulled down and applied.  You can specify
-#   any other type of service here that does not require configuration,
-#   e.g., filebucket, ca, or pelement.
+#   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+,
@@ -169,6 +170,7 @@ options = [
 	[ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--onetime",  "-o",			GetoptLong::NO_ARGUMENT ],
 	[ "--test",	    "-t",			GetoptLong::NO_ARGUMENT ],
+	[ "--serve",    "-s",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--no-client",       			GetoptLong::NO_ARGUMENT ],
 	[ "--verbose",	"-v",			GetoptLong::NO_ARGUMENT ],
 	[ "--version",	"-V",			GetoptLong::NO_ARGUMENT ],
@@ -205,8 +207,10 @@ begin
             when "--disable"
                 options[:disable] = true
             when "--serve"
-                if klass = Puppet::Network::Server::Handler.handler(arg)
-                    options[:serve][klass.name] = klass
+                if Puppet::Network::Handler.handler(arg)
+                    options[:serve][arg.to_sym] = {}
+                else
+                    raise "Could not find handler for %s" % arg
                 end
             when "--enable"
                 options[:enable] = true
@@ -214,6 +218,7 @@ begin
                 # Enable all of the most common test options.
                 Puppet.config.handlearg("--ignorecache")
                 Puppet.config.handlearg("--no-usecacheonfailure")
+                Puppet.config.handlearg("--no-splay")
                 options[:onetime] = true
                 options[:waitforcert] = 0
                 unless Puppet::Util::Log.level == :debug
@@ -268,9 +273,7 @@ rescue GetoptLong::InvalidOption => detail
 end
 
 # Now parse the config
-if Puppet[:config] and File.exists? Puppet[:config]
-    Puppet.config.parse(Puppet[:config])
-end
+Puppet.parse_config
 
 Puppet.genconfig
 Puppet.genmanifest
@@ -376,9 +379,7 @@ if Puppet[:listen] and ! options[:onetime]
     if options[:serve].empty?
         handlers = {:Runner => {}}
     else
-        handlers = options[:serve].inject({}) do |hash, name, klass|
-            hash[name] = {}
-        end
+        handlers = options[:serve]
     end
 
     handlers.each do |name, hash|
@@ -445,4 +446,4 @@ else
     Puppet.start
 end
 
-# $Id: puppetd 2375 2007-03-30 23:17:40Z luke $
+# $Id: puppetd 2594 2007-06-15 23:11:43Z luke $