puppet 0.25.4 → 0.25.5

data/conf/solaris/smf/svc-puppetmasterd

@@ -8,7 +8,7 @@ exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/puppet/run/puppetmasterd.pid
+pidfile=/var/lib/puppet/run/puppetmasterd.pid
 
 case "$1" in
 start)

data/conf/suse/puppet.spec

@@ -5,21 +5,18 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.24.1
-Release: 3%{?dist}
+Version: 0.25.4
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 
-URL: http://reductivelabs.com/projects/puppet/
-Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+URL: http://puppetlabs.com/projects/puppet/
+Source: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
 Patch0: puppet.suse.patch
-Patch1: puppet.service.patch
-
-Requires: ruby >= 1.8.6
+Requires: ruby >= 1.8.2
 Requires: facter >= 1.3.7
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArchitectures: noarch
-BuildRequires: ruby >= 1.8.6
+BuildRequires: ruby >= 1.8.2
 
 %description
 Puppet lets you centrally manage every important aspect of your system using a
@@ -38,8 +35,7 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p0
 
 %build
 for f in bin/* ; do
@@ -56,9 +52,11 @@ done
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
-%{__install} -Dp -m0755 %{pbuild}/bin/* %{buildroot}%{_sbindir}
+%{__install} -Dp -m0755 %{pbuild}/bin/* %{pbuild}/sbin/* %{buildroot}%{_sbindir}
 %{__mv} %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
 %{__mv} %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
+%{__mv} %{buildroot}%{_sbindir}/pi %{buildroot}%{_bindir}/pi
+%{__mv} %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
 %{__install} -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
 %{__cp} -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
 find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %{__chmod} a-x
@@ -73,12 +71,15 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
 %files
 %defattr(-, root, root, 0755)
 %{_bindir}/puppet
+%{_bindir}/pi
+%{_bindir}/filebucket
+%{_sbindir}/ralsh
 %{_sbindir}/puppetd
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
-%doc CHANGELOG COPYING LICENSE README TODO examples
+%doc CHANGELOG COPYING LICENSE README examples
 %exclude %{_sbindir}/puppetdoc
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
 # These need to be owned by puppet so the server can
@@ -90,6 +91,7 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
 %files server
 %defattr(-, root, root, 0755)
 %{_sbindir}/puppetmasterd
+%{_sbindir}/puppetqd
 %{_bindir}/puppetrun
 %{_initrddir}/puppetmaster
 %config(noreplace) %{_sysconfdir}/puppet/*
@@ -99,7 +101,7 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
 %pre
 /usr/sbin/groupadd -r puppet 2>/dev/null || :
 /usr/sbin/useradd -g puppet -c "Puppet" \
-    -s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null || :
+    -s /sbin/nologin -r -d /var/lib/puppet puppet 2> /dev/null || :
 
 %post
 /sbin/chkconfig --add puppet

data/conf/suse/puppet.suse.patch

@@ -0,0 +1,16 @@
+--- sbin/puppetmasterd.orig	2009-11-23 10:38:16.632264990 -0500
++++ sbin/puppetmasterd	2009-11-23 10:38:28.884265155 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ 
+ #
+ # = Synopsis
+--- sbin/puppetd.orig	2009-11-23 10:38:23.240265893 -0500
++++ sbin/puppetd	2009-11-23 10:38:35.044265271 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ # == Synopsis
+ #
+ # Retrieve the client configuration from the central puppet server and apply

data/examples/etc/puppet/fileserver.conf

@@ -2,12 +2,12 @@
 
 [dist]
     path /dist
-    allow *.madstop.com
+    allow *.puppetlabs.com
 
 [plugins]
-    path /var/puppet/plugins
-    allow *.madstop.com
+    path /var/lib/puppet/plugins
+    allow *.puppetlabs.com
 
 [facts]
-    path /var/puppet/facts
-    allow *.madstop.com
+    path /var/lib/puppet/facts
+    allow *.puppetlabs.com

data/examples/modules/sample-module/README.txt

@@ -12,6 +12,6 @@ templates/sample.erb
 Note the consistent naming of files for Puppet::Util::Autoload
 
 Reference Documents:
-http://reductivelabs.com/trac/puppet/wiki/ModuleOrganisation
-http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
-http://reductivelabs.com/trac/puppet/wiki/FunctionReference
+http://puppetlabs.com/trac/puppet/wiki/ModuleOrganisation
+http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+http://puppetlabs.com/trac/puppet/wiki/FunctionReference

data/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb

@@ -27,7 +27,7 @@
 
 # Jeff McCune <jeff.mccune@northstarlabs.net>
 # 2007-08-14
-# See: http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+# See: http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions
 
 module Puppet::Parser::Functions
     newfunction(:hostname_to_dn, :type => :rvalue, :doc => "Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.") do |args|

data/ext/extlookup.rb

@@ -74,7 +74,7 @@
 # need to edit a load of manifests to do simple things like adjust a desired version number.
 #
 # For more information on installing and writing your own custom functions see:
-#    http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
+#    http://puppetlabs.com/trac/puppet/wiki/WritingYourOwnFunctions
 #
 # For further help contact Volcane on #puppet
 require 'csv'

data/ext/nagios/check_puppet.rb

@@ -11,7 +11,7 @@ class CheckPuppet
 
     # default options
     OPTIONS = {
-        :statefile => "/var/puppet/state/state.yaml",
+        :statefile => "/var/lib/puppet/state/state.yaml",
         :process   => "puppetd",
         :interval  => 30,
     }

data/ext/nagios/naggen

@@ -29,7 +29,7 @@
 # just like any other executable.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# 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 puppet with
 # '--genconfig'.
@@ -63,7 +63,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2009 Reductive Labs, LLC
+# Copyright (c) 2009 Puppet Labs, LLC
 # Licensed under the GPL 2
 
 require 'puppet'

data/ext/puppet-test

@@ -23,7 +23,7 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
+# 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 puppetd with
 # '--genconfig'.
@@ -90,7 +90,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005, 2006 Reductive Labs, LLC
+# Copyright (c) 2005, 2006 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 # Do an initial trap, so that cancels don't get a stack trace.

data/ext/puppetlast

@@ -12,5 +12,5 @@ Puppet[:name] = "puppetmasterd"
 Puppet::Node::Facts.terminus_class = :yaml
 
 Puppet::Node::Facts.search("*").sort { |a,b| a.name <=> b.name }.each do |node|
-  puts "#{node.name} #{node.expired? ? 'cached expired, ' : ''}checked in #{((Time.now - Time.parse(node.values[:_timestamp].to_s)) / 60).floor} minutes ago"
+  puts "#{node.name} checked in #{((Time.now - Time.parse(node.values[:_timestamp].to_s)) / 60).floor} minutes ago.  Version #{node.values['puppetversion']}#{node.expired? ? '  Cache expired.' : ''}"
 end

data/ext/puppetstoredconfigclean.rb

@@ -3,7 +3,7 @@
 # Script to clean up stored configs for (a) given host(s)
 #
 # Credits:
-# Script was taken from http://reductivelabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb
+# Script was taken from http://puppetlabs.com/trac/puppet/attachment/wiki/UsingStoredConfiguration/kill_node_in_storedconfigs_db.rb
 # which haven been initially posted by James Turnbull
 # duritong adapted and improved the script a bit.
 

data/ext/regexp_nodes/regexp_nodes.rb

@@ -2,7 +2,7 @@
 
 # = Synopsis
 # This is an external node classifier script, after
-# http://reductivelabs.com/trac/puppet/wiki/ExternalNodes
+# http://puppetlabs.com/trac/puppet/wiki/ExternalNodes
 #
 # = Usage
 # regexp_nodes.rb <host>
@@ -43,14 +43,14 @@ require 'set'
 # set up some nice logging
 require 'logger'
 # XXX flip this for production vs local sandbox
-# $LOG = Logger.new("/var/puppet/log/extnodes.log")
+# $LOG = Logger.new("/var/lib/puppet/log/extnodes.log")
 # $LOG.level = Logger::FATAL
 $LOG = Logger.new($stderr)
 $LOG.level = Logger::DEBUG
 
 # paths for files we use will be relative to this directory
 # XXX flip this for production vs local sandbox
-# WORKINGDIR = "/var/puppet/bin"
+# WORKINGDIR = "/var/lib/puppet/bin"
 WORKINGDIR = Dir.pwd
 
 # This class holds all the methods for creating and accessing the properties
@@ -154,7 +154,7 @@ class ExternalNode
     # directories to get the parameter name, then use the names of the files
     # contained in there for the values of those parameters.
     #
-    # ex: cat /var/puppet/bin/parameters/environment/production
+    # ex: cat /var/lib/puppet/bin/parameters/environment/production
     # ^prodweb
     # would set parameters["environment"] = "production" for prodweb001
     def match_parameters(fullpath)

data/ext/vim/syntax/puppet.vim

@@ -19,7 +19,7 @@ endif
 " match class/definition/node declarations
 syn region  puppetDefine        start="^\s*\(class\|define\|node\)\s" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments,puppetNodeRe
 syn keyword puppetDefType       class define node inherits contained
-syn region  puppetDefArguments  start="(" end=")" contains=puppetArgument
+syn region  puppetDefArguments  start="(" end=")" contained contains=puppetArgument
 syn match   puppetArgument      "\w\+" contained
 syn match   puppetArgument      "\$\w\+" contained
 syn match   puppetArgument      "'[^']+'" contained
@@ -51,8 +51,10 @@ syn match   puppetParamDigits   "[0-9]\+"
 
 " match 'template' in 'content => template("...")'
 syn match   puppetParam         "\w\+\s*[=+]>\s*\w\+\s*(" contains=puppetFunction,puppetParamName
-syn keyword puppetFunction      debug info notice warning err alert emerg crit
-syn keyword puppetFunction      sprintf template fail tagged include generate search file tag versioncmp fqdn_rand realize split defined regsubst sha1 inline_template contained
+" statements
+syn region  puppetFunction      start="^\s*\(alert\|crit\|debug\|emerg\|err\|fail\|include\|info\|notice\|realize\|require\|search\|tag\|warning\)\s*(" end=")" contained contains=puppetString
+" rvalues
+syn region  puppetFunction      start="^\s*\(defined\|file\|fqdn_rand\|generate\|inline_template\|regsubst\|sha1\|shellquote\|split\|sprintf\|tagged\|template\|versioncmp\)\s*(" end=")" contained contains=puppetString
 
 syn match   puppetVariable      "$\w\+"
 syn match   puppetVariable      "${\w\+}"

data/install.rb

@@ -83,7 +83,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)$/ }
-man   = glob(%w{man/man8/*})
+man   = glob(%w{man/man[0-9]/*})
 libs  = glob(%w{lib/**/*.rb lib/**/*.py})
 tests = glob(%w{test/**/*.rb})
 
@@ -238,7 +238,7 @@ def prepare_installation
     opts.parse!
   end
 
-  tmpdirs = [".", ENV['TMP'], ENV['TEMP'], "/tmp", "/var/tmp"]
+  tmpdirs = [ENV['TMP'], ENV['TEMP'], "/tmp", "/var/tmp", "."]
 
   version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".")
   libdir = File.join(Config::CONFIG["libdir"], "ruby", version)
@@ -349,25 +349,27 @@ def build_ri(files)
     end
 end
 
-def build_man(bins)
+def build_man(bins, sbins)
     return unless $haveman
     begin
         # Locate rst2man
         rst2man = %x{which rst2man.py}
         rst2man.chomp!
-        # Create puppet.conf.8 man page
+        # Create puppet.conf.5 man page
         %x{bin/puppetdoc --reference configuration > ./puppet.conf.rst}
-        %x{#{rst2man} ./puppet.conf.rst ./man/man8/puppet.conf.8}
+        %x{#{rst2man} ./puppet.conf.rst ./man/man5/puppet.conf.5}
         File.unlink("./puppet.conf.rst")
 
         # Create binary man pages
-        bins.each do |bin|
-          b = bin.gsub( "bin/", "")
+        binary = bins + sbins 
+        binary.each do |bin|
+          b = bin.gsub( /(bin|sbin)\//, "")
           %x{#{bin} --help > ./#{b}.rst}
           %x{#{rst2man} ./#{b}.rst ./man/man8/#{b}.8}
           File.unlink("./#{b}.rst")
         end
-    rescue SystemCallError
+    
+rescue SystemCallError
         $stderr.puts "Couldn't build man pages: " + $!
         $stderr.puts "Continuing with install..."
     end
@@ -470,7 +472,7 @@ prepare_installation
 #run_tests(tests) if InstallOptions.tests
 #build_rdoc(rdoc) if InstallOptions.rdoc
 #build_ri(ri) if InstallOptions.ri
-#build_man(bins) if InstallOptions.man
+#build_man(bins, sbins) if InstallOptions.man
 do_bins(sbins, InstallOptions.sbin_dir)
 do_bins(bins, InstallOptions.bin_dir)
 do_libs(libs)

data/lib/puppet.rb

@@ -24,7 +24,7 @@ require 'puppet/util/suidmanager'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-    PUPPETVERSION = '0.25.4'
+    PUPPETVERSION = '0.25.5'
 
     def Puppet.version
         return PUPPETVERSION

data/lib/puppet/application/puppetd.rb

@@ -206,14 +206,15 @@ Puppet::Application.new(:puppetd) do
 
         Puppet.settings.use :main, :puppetd, :ssl
 
-        # We need to specify a ca location for things to work, but
-        # until the REST cert transfers are working, it needs to
-        # be local.
+        # This configures all of the SSL-related indirected classes.
         Puppet::SSL::Host.ca_location = :remote
 
         Puppet::Transaction::Report.terminus_class = :rest
 
-        Puppet::Resource::Catalog.terminus_class = :rest
+        # Override the default; puppetd needs this, usually.
+        # You can still override this on the command-line with, e.g., :compiler.
+        Puppet[:catalog_terminus] = :rest
+
         Puppet::Resource::Catalog.cache_class = :yaml
 
         Puppet::Node::Facts.terminus_class = :facter

data/lib/puppet/configurer.rb

@@ -91,47 +91,27 @@ class Puppet::Configurer
 
     # Get the remote catalog, yo.  Returns nil if no catalog can be found.
     def retrieve_catalog
-        name = Puppet[:certname]
-        catalog_class = Puppet::Resource::Catalog
-
-        # This is a bit complicated.  We need the serialized and escaped facts,
-        # and we need to know which format they're encoded in.  Thus, we
-        # get a hash with both of these pieces of information.
-        fact_options = facts_for_uploading()
-
-        # First try it with no cache, then with the cache.
-        result = nil
-        begin
-            duration = thinmark do
-                result = catalog_class.find(name, fact_options.merge(:ignore_cache => true))
-            end
-        rescue SystemExit,NoMemoryError
-            raise
-        rescue Exception => detail
-            puts detail.backtrace if Puppet[:trace]
-            Puppet.err "Could not retrieve catalog from remote server: %s" % detail
+        if Puppet::Resource::Catalog.indirection.terminus_class == :rest
+            # This is a bit complicated.  We need the serialized and escaped facts,
+            # and we need to know which format they're encoded in.  Thus, we
+            # get a hash with both of these pieces of information.
+            fact_options = facts_for_uploading()
+        else
+            fact_options = {}
         end
 
-        unless result
+        # First try it with no cache, then with the cache.
+        unless (Puppet[:use_cached_catalog] and result = retrieve_catalog_from_cache(fact_options)) or result = retrieve_new_catalog(fact_options)
             if ! Puppet[:usecacheonfailure]
                 Puppet.warning "Not using cache on failed catalog"
                 return nil
             end
-
-            begin
-                duration = thinmark do
-                    result = catalog_class.find(name, fact_options.merge(:ignore_terminus => true))
-                end
-                Puppet.notice "Using cached catalog"
-            rescue => detail
-                puts detail.backtrace if Puppet[:trace]
-                Puppet.err "Could not retrieve catalog from cache: %s" % detail
-            end
+            result = retrieve_catalog_from_cache(fact_options)
         end
 
         return nil unless result
 
-        convert_catalog(result, duration)
+        convert_catalog(result, @duration)
     end
 
     # Convert a plain resource catalog into our full host catalog.
@@ -208,4 +188,31 @@ class Puppet::Configurer
             raise CommandHookError, "Could not run command from #{setting}: #{detail}"
         end
     end
+
+    def retrieve_catalog_from_cache(fact_options)
+        result = nil
+        @duration = thinmark do
+            result = Puppet::Resource::Catalog.find(Puppet[:certname], fact_options.merge(:ignore_terminus => true))
+        end
+        Puppet.notice "Using cached catalog"
+        result
+    rescue => detail
+        puts detail.backtrace if Puppet[:trace]
+        Puppet.err "Could not retrieve catalog from cache: %s" % detail
+        return nil
+    end
+
+    def retrieve_new_catalog(fact_options)
+        result = nil
+        @duration = thinmark do
+            result = Puppet::Resource::Catalog.find(Puppet[:certname], fact_options.merge(:ignore_cache => true))
+        end
+        result
+    rescue SystemExit,NoMemoryError
+        raise
+    rescue Exception => detail
+        puts detail.backtrace if Puppet[:trace]
+        Puppet.err "Could not retrieve catalog from remote server: %s" % detail
+        return nil
+    end
 end