puppet 0.25.0 → 0.25.1

data/README

@@ -21,7 +21,7 @@ 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 < http://reductivelabs.com/projects/facter >
 
 $Id$

data/Rakefile

@@ -3,13 +3,13 @@
 $: << File.expand_path('lib')
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
 
-Dir['tasks/**/*.rake'].each { |t| load t }
-
 require './lib/puppet.rb'
 require 'rake'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 
+Dir['tasks/**/*.rake'].each { |t| load t }
+
 FILES = FileList[
     '[A-Z]*',
     'install.rb',
@@ -24,36 +24,18 @@ FILES = FileList[
     'spec/**/*'
 ]
 
-task :default do
-    sh %{rake -T}
-end
-
-spec = Gem::Specification.new do |spec|
-    spec.platform = Gem::Platform::RUBY
-    spec.name = 'puppet'
-    spec.files = FILES.to_a
-    spec.version = Puppet::PUPPETVERSION
-    spec.summary = 'Puppet, an automated configuration management tool'
-    spec.author = 'Reductive Labs'
-    spec.email = 'puppet@reductivelabs.com'
-    spec.homepage = 'http://reductivelabs.com'
-    spec.rubyforge_project = 'puppet'
-    spec.has_rdoc = true
-    spec.rdoc_options <<
-        '--title' <<  'Puppet - Configuration Management' <<
-        '--main' << 'README' <<
-        '--line-numbers'
-end
-
 Rake::PackageTask.new("puppet", Puppet::PUPPETVERSION) do |pkg|
     pkg.package_dir = 'pkg'
     pkg.need_tar_gz = true
     pkg.package_files = FILES.to_a
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+task :default do
+    sh %{rake -T}
 end
 
+task :puppetpackages => [:create_gem, :package]
+
 desc "Run the specs under spec/"
 task :spec do
     require 'spec'
@@ -68,7 +50,7 @@ task :spec do
         t.spec_files = FileList['spec/**/*.rb']
         if defined?(Rcov)
             t.rcov = true
-            t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*']
+            t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*']
         end
      end
 end

data/conf/osx/createpackage.sh

@@ -38,7 +38,7 @@ function find_installer() {
   elif [ -f "../${INSTALLRB}" ]; then
     installer="$(pwd)/../${INSTALLRB}"
   elif [ -f "../../${INSTALLRB}" ]; then
-    installer="$(pwd)/../${INSTALLRB}"
+    installer="$(pwd)/../../${INSTALLRB}"
   else
     installer=""
   fi

data/conf/redhat/client.init

@@ -25,7 +25,10 @@ RETVAL=0
 PUPPET_OPTS=""
 [ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
 [ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
-[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
+[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --masterport=${PUPPET_PORT}"
+
+# Determine if we can use the -p option to killproc.  RHEL < 5 can't.
+killproc | grep -q -- '-p' 2>/dev/null && killopts="-p $pidfile"
 
 # Figure out if the system just booted. Let's assume
 # boot doesn't take longer than 5 minutes
@@ -43,7 +46,7 @@ start() {
 
 stop() {
     echo -n $"Stopping puppet: "
-    killproc $puppetd
+    killproc $killopts $puppetd
     RETVAL=$?
     echo
     [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
@@ -51,7 +54,7 @@ stop() {
 
 reload() {
     echo -n $"Restarting puppet: "
-    killproc $puppetd -HUP
+    killproc $killopts $puppetd -HUP
     RETVAL=$?
     echo
     return $RETVAL

data/conf/redhat/puppet.spec

@@ -5,7 +5,7 @@
 %define confdir conf/redhat
 
 Name:           puppet
-Version:        0.25.0
+Version:        0.25.1
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
@@ -124,17 +124,19 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGELOG COPYING LICENSE README examples
-%exclude %{_bindir}/pi
+%{_bindir}/pi
 %{_bindir}/puppet
 %{_bindir}/ralsh
 %{_bindir}/filebucket
 %{_bindir}/puppetdoc
+%{_sbindir}/puppetca
 %{_sbindir}/puppetd
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
 %dir %{_sysconfdir}/puppet
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
+%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
 # We don't want to require emacs or vim, so we need to own these dirs
@@ -146,12 +148,13 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
 %attr(-, puppet, puppet) %{_localstatedir}/log/puppet
 %attr(-, puppet, puppet) %{_localstatedir}/lib/puppet
-%exclude %{_mandir}/man8/pi.8.gz
-%doc %{_mandir}/man8/puppet.8.gz
-%doc %{_mandir}/man8/puppet.conf.8.gz
-%doc %{_mandir}/man8/puppetd.8.gz
-%doc %{_mandir}/man8/ralsh.8.gz
-%doc %{_mandir}/man8/puppetdoc.8.gz
+%{_mandir}/man8/pi.8.gz
+%{_mandir}/man8/puppet.8.gz
+%{_mandir}/man8/puppet.conf.8.gz
+%{_mandir}/man8/puppetca.8.gz
+%{_mandir}/man8/puppetd.8.gz
+%{_mandir}/man8/ralsh.8.gz
+%{_mandir}/man8/puppetdoc.8.gz
 
 %files server
 %defattr(-, root, root, 0755)
@@ -162,13 +165,10 @@ install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf
 %dir %{_sysconfdir}/puppet/manifests
 %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
-%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetmasterd.conf
-%{_sbindir}/puppetca
-%doc %{_mandir}/man8/filebucket.8.gz
-%doc %{_mandir}/man8/puppetca.8.gz
-%doc %{_mandir}/man8/puppetmasterd.8.gz
-%doc %{_mandir}/man8/puppetrun.8.gz
+%{_mandir}/man8/filebucket.8.gz
+%{_mandir}/man8/puppetmasterd.8.gz
+%{_mandir}/man8/puppetrun.8.gz
 
 # Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5),
 # and 471919 (RHEL-4)
@@ -214,6 +214,18 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Tue Oct 20 2009 Todd Zullinger <tmz@pobox.com> - 0.25.1-1
+- Update to 0.25.1
+- Include the pi program and man page (R.I.Pienaar)
+
+* Sat Oct 17 2009 Todd Zullinger <tmz@pobox.com> - 0.25.1-0.2.rc2
+- Update to 0.25.1rc2
+
+* Tue Sep 22 2009 Todd Zullinger <tmz@pobox.com> - 0.25.1-0.1.rc1
+- Update to 0.25.1rc1
+- Move puppetca to puppet package, it has uses on client systems
+- Drop redundant %%doc from manpage %%file listings
+
 * Fri Sep 04 2009 Todd Zullinger <tmz@pobox.com> - 0.25.0-1
 - Update to 0.25.0
 - Fix permissions on /var/log/puppet (#495096)

data/conf/redhat/server.init

@@ -71,8 +71,9 @@ stop() {
             ret=$?; [ $ret != 0 ] && RETVAL=$ret
         done
     else
-       killproc $PUPPETMASTER
-       RETVAL=$?
+        killproc | grep -q -- '-p' 2>/dev/null && killopts="-p $pidfile"
+        killproc $killopts $PUPPETMASTER
+        RETVAL=$?
     fi
     echo
     [ $RETVAL -eq 0 ] && rm -f "$lockfile"

data/ext/vim/syntax/puppet.vim

@@ -17,7 +17,7 @@ elseif exists("b:current_syntax")
 endif
 
 " match class/definition/node declarations
-syn region  puppetDefine        start="^\s*\(class\|define\|node\)\s" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments
+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 match   puppetArgument      "\w\+" contained
@@ -25,6 +25,7 @@ syn match   puppetArgument      "\$\w\+" contained
 syn match   puppetArgument      "'[^']+'" contained
 syn match   puppetArgument      '"[^"]+"' contained
 syn match   puppetDefName       "\w\+" contained
+syn match   puppetNodeRe        "/.*/" contained
 
 " match 'foo' in 'class foo { ...'
 " match 'foo::bar' in 'class foo::bar { ...'
@@ -60,6 +61,7 @@ syn match   puppetVariable      "${\w\+}"
 " don't match variables if preceded by a backslash.
 syn region  puppetString        start=+'+ skip=+\\\\\|\\'+ end=+'+
 syn region  puppetString        start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=puppetVariable,puppetNotVariable
+syn match   puppetString        "/.*/"
 syn match   puppetNotVariable   "\\$\w\+" contained
 syn match   puppetNotVariable   "\\${\w\+}" contained
 
@@ -97,6 +99,7 @@ if version >= 508 || !exists("did_puppet_syn_inits")
   HiLink puppetControl              Statement
   HiLink puppetDefType              Define
   HiLink puppetDefName              Type
+  HiLink puppetNodeRe               Type
   HiLink puppetTypeName             Statement
   HiLink puppetTypeDefault          Type
   HiLink puppetParamName            Identifier

data/install.rb

@@ -35,7 +35,13 @@
 require 'rbconfig'
 require 'find'
 require 'fileutils'
-require 'ftools' # apparently on some system ftools doesn't get loaded
+begin
+  require 'ftools' # apparently on some system ftools doesn't get loaded
+  $haveftools = true
+rescue LoadError
+  puts "ftools not found.  Using FileUtils instead.."
+  $haveftools = false
+end
 require 'optparse'
 require 'ostruct'
 
@@ -92,9 +98,15 @@ def do_libs(libs, strip = 'lib/')
   libs.each do |lf|
     olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, ''))
     op = File.dirname(olf)
-    File.makedirs(op, true)
-    File.chmod(0755, op)
-    File.install(lf, olf, 0644, true)
+    if $haveftools
+      File.makedirs(op, true)
+      File.chmod(0755, op)
+      File.install(lf, olf, 0644, true)
+    else
+      FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
+      FileUtils.chmod(0755, op)
+      FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
+    end
   end
 end
 
@@ -102,9 +114,15 @@ def do_man(man, strip = 'man/')
   man.each do |mf|
     omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
     om = File.dirname(omf)
-    File.makedirs(om, true)
-    File.chmod(0755, om)
-    File.install(mf, omf, 0644, true)
+    if $haveftools
+      File.makedirs(om, true)
+      File.chmod(0755, om)
+      File.install(mf, omf, 0644, true)
+    else
+      FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
+      FileUtils.chmod(0755, om)
+      FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
+    end
     gzip = %x{which gzip}
     gzip.chomp!
     %x{#{gzip} -f #{omf}}

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.0'
+    PUPPETVERSION = '0.25.1'
 
     def Puppet.version
         return PUPPETVERSION

data/lib/puppet/agent.rb

@@ -122,9 +122,9 @@ class Puppet::Agent
     def with_client
         begin
             @client = client_class.new
-        rescue => details
+        rescue => detail
             puts detail.backtrace if Puppet[:trace]
-            Puppet.err "Could not create instance of %s: %s" % [client_class, details]
+            Puppet.err "Could not create instance of %s: %s" % [client_class, detail]
             return
         end
         yield @client

data/lib/puppet/application/puppet.rb

@@ -49,12 +49,12 @@ Puppet::Application.new(:puppet) do
         end
 
         begin
-            catalog = JSON.parse(text)
+            catalog = PSON.parse(text)
             unless catalog.is_a?(Puppet::Resource::Catalog)
-                catalog = Puppet::Resource::Catalog.json_create(catalog)
+                catalog = Puppet::Resource::Catalog.pson_create(catalog)
             end
         rescue => detail
-            raise Puppet::Error, "Could not deserialize catalog from json: %s" % detail
+            raise Puppet::Error, "Could not deserialize catalog from pson: %s" % detail
         end
 
         catalog = catalog.to_ral

data/lib/puppet/application/puppetd.rb

@@ -160,13 +160,6 @@ Puppet::Application.new(:puppetd) do
             exit(14)
         end
 
-        # FIXME: we should really figure out how to distribute the CRL
-        # to clients. In the meantime, we just disable CRL checking if
-        # the CRL file doesn't exist
-        unless File::exist?(Puppet[:cacrl])
-            Puppet[:cacrl] = 'false'
-        end
-
         handlers = nil
 
         if options[:serve].empty?

data/lib/puppet/application/puppetdoc.rb

@@ -79,6 +79,7 @@ Puppet::Application.new(:puppetdoc) do
             if @manifest
                 Puppet::Util::RDoc.manifestdoc(files)
             else
+                options[:outputdir] = "doc" unless options[:outputdir]
                 Puppet::Util::RDoc.rdoc(options[:outputdir], files)
             end
         rescue => detail

data/lib/puppet/application/puppetmasterd.rb

@@ -53,13 +53,13 @@ Puppet::Application.new(:puppetmasterd) do
 
     command(:compile) do
         Puppet::Util::Log.newdestination :console
-        raise ArgumentError, "Cannot render compiled catalogs without json support" unless Puppet.features.json?
+        raise ArgumentError, "Cannot render compiled catalogs without pson support" unless Puppet.features.pson?
         begin
             unless catalog = Puppet::Resource::Catalog.find(options[:node])
                 raise "Could not compile catalog for %s" % options[:node] 
             end
 
-            $stdout.puts catalog.render(:json)
+            $stdout.puts catalog.render(:pson)
         rescue => detail
             $stderr.puts detail
             exit(30)

data/lib/puppet/configurer.rb

@@ -133,7 +133,12 @@ class Puppet::Configurer
     # This just passes any options on to the catalog,
     # which accepts :tags and :ignoreschedules.
     def run(options = {})
-        prepare()
+        begin
+            prepare()
+        rescue Exception => detail
+            puts detail.backtrace if Puppet[:trace]
+            Puppet.err "Failed to prepare catalog: %s" % detail
+        end
 
         if catalog = options[:catalog]
             options.delete(:catalog)

data/lib/puppet/configurer/fact_handler.rb

@@ -29,11 +29,11 @@ module Puppet::Configurer::FactHandler
         #format = facts.class.default_format
 
         # Hard-code yaml, because I couldn't get marshal to work.
-        format = :yaml
+        format = :b64_zlib_yaml
 
         text = facts.render(format)
 
-        return {:facts_format => format, :facts => CGI.escape(text)}
+        return {:facts_format => :b64_zlib_yaml, :facts => CGI.escape(text)}
     end
 
     # Retrieve facts from the central server.

data/lib/puppet/defaults.rb

@@ -168,7 +168,7 @@ module Puppet
         :queue_source => ["stomp://localhost:61613/", "Which type of queue to use for asynchronous processing.  If your stomp server requires
             authentication, you can include it in the URI as long as your stomp client library is at least 1.1.1"],
         :async_storeconfigs => {:default => false, :desc => "Whether to use a queueing system to provide asynchronous database integration.
-            Requires that ``puppetqd`` be running and that 'JSON' support for ruby be installed.",
+            Requires that ``puppetqd`` be running and that 'PSON' support for ruby be installed.",
             :hook => proc do |value|
                 if value
                     # This reconfigures the terminii for Node, Facts, and Catalog
@@ -522,7 +522,7 @@ module Puppet
             authority requests.  It's a separate server because it cannot
             and does not need to horizontally scale."],
         :ca_port => ["$masterport", "The port to use for the certificate authority."],
-        :preferred_serialization_format => ["json", "The preferred means of serializing
+        :preferred_serialization_format => ["pson", "The preferred means of serializing
             ruby instances for passing over the wire.  This won't guarantee that all
             instances will be serialized using this method, since not all classes
             can be guaranteed to support this format, but it will be used for all

data/lib/puppet/external/nagios/base.rb

@@ -423,9 +423,10 @@ class Nagios::Base
     end
 
     newtype :serviceescalation do
-        setparameters :host_name, :hostgroup_name, :service_description, :contacts,
-            :contact_groups, :first_notification, :last_notification,
-            :notification_interval, :escalation_period, :escalation_options,
+        setparameters :host_name, :hostgroup_name, :servicegroup_name,
+            :service_description, :contacts, :contact_groups,
+            :first_notification, :last_notification, :notification_interval,
+            :escalation_period, :escalation_options,
             :register, :use,
             :_naginator_name