puppet 0.23.2 → 0.24.0

data/examples/code/modules/sample-module/manifests/init.pp

@@ -0,0 +1,12 @@
+# Jeff McCune <jeff.mccune@northstarlabs.net>
+# 
+# Demonstration of a custom parser function and erb template within
+# a module, working in concert.
+
+class sample-module {
+  $fqdn_to_dn = hostname_to_dn($domain)
+  $sample_template = template("sample-module/sample.erb")
+  
+  notice("hostname_to_dn module function returned: [$fqdn_to_dn]")
+  info("sample.erb looks like:\n$sample_template")
+}

data/examples/code/modules/sample-module/templates/sample.erb

@@ -0,0 +1,5 @@
+
+## Jeff McCune <jeff.mccune@northstarlabs.net>
+fqdn:   <%= fqdn %>
+basedn: <%= fqdn_to_dn %>
+## end sample.erb ##

data/examples/code/nodes

@@ -1,4 +1,4 @@
-# $Id: nodes 418 2005-07-18 20:05:27Z luke $
+# $Id$
 
 # define nodes
 

data/examples/code/one

@@ -1,4 +1,4 @@
-# $Id: one 397 2005-07-14 20:01:13Z luke $
+# $Id$
 
 # this service doesn't actually exist, so we noop it
 # and this way, we can test noop :)

data/examples/code/relationships

@@ -1,4 +1,4 @@
-# $Id: relationships 832 2006-01-17 07:11:50Z luke $
+# $Id$
 
 #service.setpath("../examples/root/etc/init.d")
 #puppet.statefile("/tmp/puppetstate")

data/examples/code/selectors

@@ -1,4 +1,4 @@
-# $Id: selectors 599 2005-08-29 21:03:46Z luke $
+# $Id$
 #
 
 $platform = SunOS

data/examples/code/simpletests

@@ -1,4 +1,4 @@
-# $Id: simpletests 832 2006-01-17 07:11:50Z luke $
+# $Id$
 
 file {
     "/tmp/atest": ensure => file;

data/examples/root/etc/init.d/sleeper

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# $Id: sleeper 1569 2006-09-05 23:46:32Z luke $
+# $Id$
 
 script=$0
 path=`echo $script | sed 's/etc..*/bin/'`

data/examples/root/etc/puppet/fileserver.conf

@@ -1,4 +1,4 @@
-# $Id: fileserver.conf 1861 2006-11-12 22:16:59Z luke $
+# $Id$
 
 [dist]
     path /dist

data/ext/ldap/puppet.schema

@@ -1,6 +1,6 @@
 # These OIDs are all fake.  No guarantees there won't be conflicts.
 #
-# $Id: puppet.schema 1260 2006-06-13 18:09:07Z luke $
+# $Id$
 
 attributetype ( 1.1.3.10 NAME 'puppetclass'
 	DESC 'Puppet Node Class'

data/ext/module_puppet

@@ -61,7 +61,7 @@ options = [
 ]
 
 # Add all of the config parameters as valid options.
-Puppet.config.addargs(options)
+Puppet.settings.addargs(options)
 
 result = GetoptLong.new(*options)
 
@@ -108,7 +108,7 @@ begin
                     $stderr.puts detail.to_s
                 end
             else
-                Puppet.config.handlearg(opt, arg)
+                Puppet.settings.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
@@ -121,7 +121,7 @@ end
 
 # Now parse the config
 if Puppet[:config] and File.exists? Puppet[:config]
-    Puppet.config.parse(Puppet[:config])
+    Puppet.settings.parse(Puppet[:config])
 end
 
 client = nil
@@ -150,14 +150,23 @@ unless setdest
     Puppet::Util::Log.newdestination(:syslog)
 end
 
-master[:Manifest] = ARGV.shift
+Puppet[:manifest] = ARGV.shift
 
 unless ENV.include?("CFALLCLASSES")
     $stderr.puts "Cfengine classes must be passed to the module"
     exit(15)
 end
 
-master[:UseNodes] = false
+# Collect our facts.
+Puppet::Node::Facts.terminus_class = :facter
+facts = Puppet::Node::Facts.find("me")
+facts.name = facts.values["hostname"]
+
+# Create our Node
+node = Puppet::Node.new(facts.name)
+
+# Merge in the facts.
+node.merge(facts.values)
 
 classes = ENV["CFALLCLASSES"].split(":")
 
@@ -166,33 +175,33 @@ if classes.empty?
     exit(16)
 end
 
-master[:Classes] = classes
+node.classes = classes
 
 begin
-    server = Puppet::Network::Handler.master.new(master)
+    # Compile our configuration
+    catalog = Puppet::Node::Catalog.find(node)
 rescue => detail
-    $stderr.puts detail
-    exit(1)
-end
-
-begin
-    client = Puppet::Network::Client.master.new(
-        :Master => server,
-        :Cache => false
-    )
-rescue => detail
-    $stderr.puts detail
+    if Puppet[:trace]
+        puts detail.backtrace
+    end
+    if detail.is_a?(XMLRPC::FaultException)
+        $stderr.puts detail.message
+    else
+        $stderr.puts detail
+    end
     exit(1)
 end
 
-
 if parseonly
     exit(0)
 end
 
 begin
-    client.getconfig
-    client.apply
+    # Translate it to a RAL configuration
+    catalog = catalog.to_ral
+
+    # And apply it
+    catalog.apply
 rescue => detail
     Puppet.err detail
     exit(1)

data/ext/puppet-test

@@ -200,7 +200,7 @@ class Suite
     end
 end
 
-Suite.new :configuration, "Configuration handling" do
+Suite.new :catalog, "Catalog handling" do
     def prepare
         $args[:cache] = false
         # Create a config client and pull the config down
@@ -227,7 +227,7 @@ Suite.new :configuration, "Configuration handling" do
         @facts = YAML.dump(@facts)
     end
 
-    newtest :compile, "Compiled configuration" do
+    newtest :compile, "Compiled catalog" do
         @client.driver.getconfig(@facts, "yaml")
     end
 
@@ -438,4 +438,4 @@ if $options[:fork] > 0
     Process.waitall
 end
 
-# $Id: puppet-test 2731 2007-07-31 02:34:28Z luke $
+# $Id$

data/ext/vim/filetype.vim

@@ -1,5 +1,5 @@
 " detect puppet filetypes
-" $Id: filetype.vim 875 2006-02-07 23:56:16Z luke $
+" $Id$
 
 if exists("did_load_filetypes")
     finish

data/install.rb

@@ -30,7 +30,6 @@
 # 5) Install all library files ending in .rb from lib/ into Ruby's
 #    site_lib/version directory.
 #
-# $Id: install.rb 2580 2007-06-14 06:11:46Z luke $
 #++
 
 require 'rbconfig'
@@ -65,7 +64,7 @@ sbins = glob(%w{sbin/*})
 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)$/ }
-libs  = glob(%w{lib/**/*.rb})
+libs  = glob(%w{lib/**/*.rb lib/**/*.py})
 tests = glob(%w{tests/**/*.rb})
 
 def do_bins(bins, target, strip = 's?bin/')

data/lib/puppet.rb

@@ -12,7 +12,7 @@ require 'puppet/external/event-loop'
 require 'puppet/util'
 require 'puppet/util/log'
 require 'puppet/util/autoload'
-require 'puppet/util/config'
+require 'puppet/util/settings'
 require 'puppet/util/feature'
 require 'puppet/util/suidmanager'
 
@@ -25,7 +25,7 @@ require 'puppet/util/suidmanager'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-    PUPPETVERSION = '0.23.2'
+    PUPPETVERSION = '0.24.0'
 
     def Puppet.version
         return PUPPETVERSION
@@ -45,7 +45,7 @@ module Puppet
     end
 
     # the hash that determines how our system behaves
-    @@config = Puppet::Util::Config.new
+    @@settings = Puppet::Util::Settings.new
 
     # The services running in this process.
     @services ||= []
@@ -76,7 +76,7 @@ module Puppet
 
     # Store a new default value.
     def self.setdefaults(section, hash)
-        @@config.setdefaults(section, hash)
+        @@settings.setdefaults(section, hash)
     end
 
 	# configuration parameter access and stuff
@@ -89,17 +89,17 @@ module Puppet
                 return false
             end
         else
-            return @@config[param]
+            return @@settings[param]
         end
 	end
 
 	# configuration parameter access and stuff
 	def self.[]=(param,value)
-        @@config[param] = value
+        @@settings[param] = value
 	end
 
     def self.clear
-        @@config.clear
+        @@settings.clear
     end
 
     def self.debug=(value)
@@ -110,19 +110,21 @@ module Puppet
         end
     end
 
-    def self.config
-        @@config
+    def self.settings
+        @@settings
     end
 
     # Load all of the configuration parameters.
-    require 'puppet/configuration'
+    require 'puppet/defaults'
 
+    # Prints the contents of a config file with the available config elements, or it
+    # prints a single value of a config element.
     def self.genconfig
         if Puppet[:configprint] != ""
             val = Puppet[:configprint]
             if val == "all"
                 hash = {}
-                Puppet.config.each do |name, obj|
+                Puppet.settings.each do |name, obj|
                     val = obj.value
                     case val
                     when true, false, "": val = val.inspect
@@ -134,7 +136,7 @@ module Puppet
                 end
             elsif val =~ /,/
                 val.split(/\s*,\s*/).sort.each do |v|
-                    if Puppet.config.include?(v)
+                    if Puppet.settings.include?(v)
                         puts "%s = %s" % [v, Puppet[v]]
                     else
                         puts "invalid parameter: %s" % v
@@ -143,7 +145,7 @@ module Puppet
                 end
             else
                 val.split(/\s*,\s*/).sort.each do |v|
-                    if Puppet.config.include?(v)
+                    if Puppet.settings.include?(v)
                         puts Puppet[val]
                     else
                         puts "invalid parameter: %s" % v
@@ -154,14 +156,14 @@ module Puppet
             exit(0)
         end
         if Puppet[:genconfig]
-            puts Puppet.config.to_config
+            puts Puppet.settings.to_config
             exit(0)
         end
     end
 
     def self.genmanifest
         if Puppet[:genmanifest]
-            puts Puppet.config.to_manifest
+            puts Puppet.settings.to_manifest
             exit(0)
         end
     end
@@ -208,14 +210,14 @@ module Puppet
         oldconfig ||= File.join(Puppet[:confdir], Puppet[:name].to_s + ".conf")
         if FileTest.exists?(oldconfig) and Puppet[:name] != "puppet"
             Puppet.warning "Individual config files are deprecated; remove %s and use puppet.conf" % oldconfig
-            Puppet.config.old_parse(oldconfig)
+            Puppet.settings.old_parse(oldconfig)
             return
         end
 
         # Now check for the normal config.
         if Puppet[:config] and File.exists? Puppet[:config]
             Puppet.debug "Parsing %s" % Puppet[:config]
-            Puppet.config.parse(Puppet[:config])
+            Puppet.settings.parse(Puppet[:config])
         end
     end
 
@@ -242,7 +244,7 @@ module Puppet
 
         # Handle restarting.
         trap(:HUP) do
-            if client = @services.find { |s| s.is_a? Puppet::Network::Client::Master } and client.running?
+            if client = @services.find { |s| s.is_a? Puppet::Network::Client.master } and client.running?
                 client.restart
             else
                 Puppet.restart
@@ -428,4 +430,3 @@ if Puppet[:storeconfigs]
     require 'puppet/rails'
 end
 
-# $Id: puppet.rb 2754 2007-08-07 02:41:06Z luke $

data/lib/puppet/checksum.rb

@@ -0,0 +1,57 @@
+#
+#  Created by Luke Kanies on 2007-9-22.
+#  Copyright (c) 2007. All rights reserved.
+
+require 'puppet'
+require 'puppet/util/checksums'
+require 'puppet/indirector'
+
+# A checksum class to model translating checksums to file paths.  This
+# is the new filebucket.
+class Puppet::Checksum
+    include Puppet::Util::Checksums
+
+    extend Puppet::Indirector
+
+    indirects :checksum
+
+    attr_reader :algorithm, :content
+
+    def algorithm=(value)
+        unless respond_to?(value)
+            raise ArgumentError, "Checksum algorithm %s is not supported" % value
+        end
+        value = value.intern if value.is_a?(String)
+        @algorithm = value
+        # Reset the checksum so it's forced to be recalculated.
+        @checksum = nil
+    end
+
+    # Calculate (if necessary) and return the checksum
+    def checksum
+        unless @checksum
+            @checksum = send(algorithm, content)
+        end
+        @checksum
+    end
+
+    def initialize(content, algorithm = "md5")
+        raise ArgumentError.new("You must specify the content") unless content
+
+        @content = content
+
+        # Init to avoid warnings.
+        @checksum = nil
+
+        self.algorithm = algorithm
+    end
+
+    # This is here so the Indirector::File terminus works correctly.
+    def name
+        checksum
+    end
+
+    def to_s
+        "Checksum<{%s}%s>" % [algorithm, checksum]
+    end
+end

data/lib/puppet/config_stores/rest.rb

@@ -1,4 +1,4 @@
-Puppet::Util::ConfigStore.newstore(:rest) do
+Puppet::Util::SettingsStore.newstore(:rest) do
     desc "Store client configurations via a REST web service."
 
     require 'net/http'

data/lib/puppet/daemon.rb

@@ -81,4 +81,3 @@ module Puppet::Daemon
     end
 end
 
-# $Id: daemon.rb 2259 2007-03-06 19:03:05Z luke $

data/lib/puppet/{configuration.rb → defaults.rb}

@@ -6,6 +6,10 @@ module Puppet
     var = nil
     name = $0.gsub(/.+#{File::SEPARATOR}/,'').sub(/\.rb$/, '')
 
+    # Make File.expand_path happy
+    require 'etc'
+    ENV["HOME"] ||= Etc.getpwuid(Process.uid).dir
+
     if name != "puppetmasterd" and Puppet::Util::SUIDManager.uid != 0
         conf = File.expand_path("~/.puppet")
         var = File.expand_path("~/.puppet/var")
@@ -51,18 +55,11 @@ module Puppet
             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 => 01777,
+            :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)."
         },
-        :statefile => { :default => "$statedir/state.yaml",
-            :mode => 0660,
-            :desc => "Where puppetd and puppetmasterd store state associated
-                with the running configuration.  In the case of puppetmasterd,
-                this file reflects the state discovered through interacting
-                with clients."
-            },
         :ssldir => {
             :default => "$confdir/ssl",
             :mode => 0771,
@@ -70,7 +67,6 @@ module Puppet
             :desc => "Where SSL certificates are kept."
         },
         :rundir => { :default => rundir,
-            :mode => 01777,
             :desc => "Where Puppet PID files are kept."
         },
         :genconfig => [false,
@@ -107,6 +103,7 @@ module Puppet
                 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|
                 if defined? @oldlibdir and $:.include?(@oldlibdir)
                     $:.delete(@oldlibdir)
@@ -122,7 +119,34 @@ module Puppet
             "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 ``puppetd`` and ``puppetmasterd``."
-        ]
+        ],
+        :environments => ["production,development", "The valid environments for Puppet clients.
+            This is more useful as a server-side setting than client, but any
+            environment chosen must be in this list.  Values should be
+            separated by a comma."],
+        :environment => {:default => "development", :desc => "The environment Puppet is running in.  For clients
+            (e.g., ``puppetd``) this determines the environment itself, which
+            is used to find modules and much more.  For servers (i.e.,
+            ``puppetmasterd``) this provides the default environment for nodes
+            we know nothing about.",
+            :hook => proc { |value| raise(ArgumentError, "Invalid environment %s" % value) unless Puppet::Node::Environment.valid?(value) }
+        },
+        :diff_args => ["", "Which arguments to pass to the diff command when printing differences between files."],
+        :diff => ["diff", "Which diff command to use when printing differences between files."],
+        :show_diff => [false, "Whether to print a contextual diff when files are being replaced.  The diff
+            is printed on stdout, so this option is meaningless unless you are running Puppet interactively.
+            This feature currently requires the ``diff/lcs`` Ruby library."],
+        :yamldir => {:default => "$vardir/yaml", :owner => "$user", :group => "$user", :mode => "750",
+            :desc => "The directory in which YAML data is stored, usually in a subdirectory."},
+        :daemonize => { :default => true,
+            :desc => "Send the process into the background.  This is the default.",
+            :short => "D"
+        },
+        :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."],
+        :node_terminus => ["plain", "Where to find information about nodes."]
     )
 
     hostname = Facter["hostname"].value
@@ -136,6 +160,9 @@ module Puppet
     Puppet.setdefaults(:ssl,
         :certname => [fqdn, "The name to use when handling certificates.  Defaults
             to the fully qualified domain name."],
+        :certdnsnames => ['', "The DNS names on the Server certificate as a colon-separated list.
+            If it's anything other than an empty string, it will be used as an alias in the created
+            certificate.  By default, only the server gets an alias set up, and only for 'puppet'."],
         :certdir => ["$ssldir/certs", "The certificate directory."],
         :publickeydir => ["$ssldir/public_keys", "The public key directory."],
         :privatekeydir => { :default => "$ssldir/private_keys",
@@ -258,7 +285,7 @@ module Puppet
     )
 
     # Define the config default.
-    self.setdefaults(self.config[:name],
+    self.setdefaults(self.settings[:name],
         :config => ["$confdir/puppet.conf",
             "The configuration file for #{Puppet[:name]}."],
         :pidfile => ["", "The pid file"],
@@ -277,6 +304,9 @@ module Puppet
             "Where puppetmasterd looks for its manifests."],
         :manifest => ["$manifestdir/site.pp",
             "The entry-point manifest for puppetmasterd."],
+        :code => ["", "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",
             :owner => "$user",
             :group => "$group",
@@ -326,11 +356,18 @@ module Puppet
             :mode => 0660,
             :desc => "Where puppetd caches the local configuration.  An
                 extension indicating the cache format is added automatically."},
+        :statefile => { :default => "$statedir/state.yaml",
+            :mode => 0660,
+            :desc => "Where puppetd and puppetmasterd store state associated
+                with the running configuration.  In the case of puppetmasterd,
+                this file reflects the state discovered through interacting
+                with clients."
+            },
         :classfile => { :default => "$statedir/classes.txt",
             :owner => "root",
             :mode => 0644,
             :desc => "The file in which puppetd stores a list of the classes
-                associated with the retrieved configuratiion.  Can be loaded in
+                associated with the retrieved configuration.  Can be loaded in
                 the separate ``puppet`` executable using the ``--loadclasses``
                 option."},
         :puppetdlog => { :default => "$logdir/puppetd.log",
@@ -348,6 +385,11 @@ module Puppet
             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"],
+        :http_keepalive => [true,
+            "Whether to reuse http connections, thus enabling http-keepalive."],
+        :http_enable_post_connection_check => [true,
+            "Boolean; wheter or not puppetd should validate the server
+            SSL certificate against the request hostname."],
         :server => ["puppet",
             "The server to which server puppetd should connect"],
         :ignoreschedules => [false,
@@ -485,16 +527,6 @@ module Puppet
             "The server through which to send email reports."]
     )
 
-    self.setdefaults(:facts,
-        :factstore => ["yaml",
-            "The backend store to use for client facts."]
-    )
-
-    self.setdefaults(:yamlfacts,
-        :yamlfactdir => ["$vardir/facts",
-            "The directory in which client facts are stored when the yaml fact store is used."]
-    )
-
     self.setdefaults(:rails,
         :dblocation => { :default => "$statedir/clientconfigs.sqlite3",
             :mode => 0660,
@@ -512,6 +544,8 @@ module Puppet
             used when networked databases are used."],
         :dbpassword => [ "puppet", "The database password for Client caching. Only
             used when networked databases are used."],
+        :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 => "$user",
@@ -638,4 +672,3 @@ module Puppet
     )
 end
 
-# $Id: configuration.rb 2752 2007-08-06 20:05:28Z luke $