puppet 0.24.7 → 0.24.8

data/CHANGELOG

@@ -1,3 +1,75 @@
+0.24.8
+    Fixed #2077 - ralsh user broken on OSX
+    
+    Fixed #2004 - ssh_authorized_key fails if no target is defined
+
+    Fixed #1629 - incorrect permissions on ssh_authorized_keys created files
+
+    Fixed #2000 - No default specified for checksum
+
+    Fixed #2026 - Red Hat ignoring stop method
+
+    Added ext/dbfix.sql script - fixes common errors in stored configuration databases
+
+    Fixed #1963 - Failing to read /proc/mounts for selinux kills file downloads
+
+    Fixed #2025 - gentoo service provider handle only default init level
+
+    Fixed #1910 - updated logcheck
+
+    Fixed #1871 - Sensitive information leaked in log reports
+
+    Fixed #1956 - Cleaned up variable names to be more sane, clarified error messages 
+    and fixed incorrect use of 'value' variable rather than 'member'.
+    
+    Fixed #1831 - Added sprintf function
+
+    Fixed #1830 - Added regsubst function
+
+    Updated up2date and service confines to add support for Oracle EL and VM
+
+    Fixing #1948 and #1953 - augeas ins bug: wrong number of arguments (1 for 3)
+
+    Fixing #944 - changing error message from warning to info - connection recycled 
+
+    Fixed #961 - puppetd creating too many/not closing TCP connections
+
+    Fixed #1959 - Added column protection for environment schema migration
+
+    Fixing #1869 - autoloaded files should never leak exceptions
+
+    Fixing #1543 - Nagios parse errors no longer kill Puppet
+
+    Fixed #1420 - nagios_serviceescalation not allowing host_name more than one type
+
+    Fixed #1884 - Exported resources are marked as unexported when collected on the exporting host
+
+    Fixed #1922 - Functions squash all arguments into a single hash
+    
+    Fixed #1538 - Yumrepo sets permissions wrongly on files in /etc/yum.repos.d
+
+    Fixed #1936 - Added /* */ support to the vim file
+
+    Fixed #1541 -  nagios objects write files to clientbucket on every change
+
+    Fixed #1542 - cannot purge nagios objects
+ 
+    Fixing #1912 - gid still works with no 'should' value fixing ralsh issues
+
+    Fixing the Rakefile to use 'git format-patch'
+
+    Added README.rst file
+
+    Enhancements to Stored Configuration performance
+
+    Added Reductive Labs build library to tasks directory
+
+    Fixed #1852 - Correct behaviour when no SELinux bindings
+ 
+    Updated Red Hat spec file 0.24.7
+
+    Fixed #1920 - Shadow password corruption 
+
 0.24.7
     Fixed #1804 - Added VDev and MultiVDev properties to the ZPool type
 

data/README.rst

@@ -0,0 +1,38 @@
+Puppet
+======
+
+Puppet, an automated administrative engine for your Linux and Unix systems, performs 
+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`_.
+
+Installation
+------------
+
+Generally, you need the following things installed:
+
+* Ruby >= 1.8.1 (earlier releases might work but probably not)
+
+* The Ruby OpenSSL library.  For some reason, this often isn't included
+  in the main ruby distributions.  You can test for it by running
+  'ruby -ropenssl -e "puts :yep"'.  If that errors out, you're missing the
+  library.
+
+  If your distribution doesn't come with the necessary library (e.g., on Debian
+  and Ubuntu you need to install libopenssl-ruby), then you'll probably have to
+  compile Ruby yourself, since it's part of the standard library and not
+  available separately.  You could probably just compile and install that one
+  library, though.
+
+* The Ruby XMLRPC client and server libraries.  For some reason, this often
+  isn't included in the main ruby distributions.  You can test for it by
+  running 'ruby -rxmlrpc/client -e "puts :yep"'.  If that errors out, you're missing
+  the library.
+
+* Facter => 1.1.1
+  You can get this from your package management system or the `Facter site`_ 
+
+.. _Puppet Wiki: http://reductivelabs.com/trac/puppet/wiki/DocumentationStart
+.. _Facter site: http://reductivelabs.com/projects/facter

data/Rakefile

@@ -1,5 +1,7 @@
 # Rakefile for Puppet -*- ruby -*-
 
+$LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
+
 $: << File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
 
 begin
@@ -191,7 +193,7 @@ task :mail_patches do
     type, parent, name = $1, $2, $3
 
     # Create all of the patches
-    sh "git-format-patch -C -M -s -n #{parent}..HEAD"
+    sh "git format-patch -C -M -s -n #{parent}..HEAD"
 
     # And then mail them out.
 

data/bin/ralsh

@@ -88,6 +88,7 @@
 
 require 'getoptlong'
 require 'puppet'
+require 'facter'
 
 options = [
     [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
@@ -99,6 +100,9 @@ options = [
     [ "--help",             "-h",                   GetoptLong::NO_ARGUMENT ]
 ]
 
+# Load facts from Facter
+Facter.loadfacts
+
 # Add all of the config parameters as valid options.
 Puppet.settings.addargs(options)
 

data/conf/redhat/puppet.spec

@@ -2,12 +2,14 @@
 %define confdir conf/redhat
 
 Name:           puppet
-Version:        0.24.6
-Release:        1%{?dist}
+Version:        0.24.7
+Release:        3%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
 Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+Group:          System Environment/Base
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby >= 1.8.1
@@ -18,8 +20,14 @@ Requires:       ruby(abi) = 1.8
 Requires:       ruby-shadow
 %endif
 
+# Pull in libselinux-ruby where it is available
+%if 0%{?fedora} >=9
+Requires:       libselinux-ruby
+%endif
+
 Requires:       facter >= 1.1.4
 Requires:       ruby >= 1.8.1
+Requires:       ruby-augeas
 Requires(pre):  shadow-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -142,9 +150,12 @@ touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 %doc %{_mandir}/man8/puppetmasterd.8.gz
 %doc %{_mandir}/man8/puppetrun.8.gz
 
+# Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5),
+# and 471919 (RHEL-4)
 %pre
-getent group puppet >/dev/null || groupadd -r puppet
+getent group puppet >/dev/null || groupadd -r puppet -g 52
 getent passwd puppet >/dev/null || \
+useradd -r -u 52 -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \
 useradd -r -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \
     -c "Puppet" puppet || :
 # ensure that old setups have the right puppet home dir
@@ -184,6 +195,12 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Tue Dec 16 2008 Jeroen van Meeuwen <kanarip@kanarip.com> - 0.24.7-3
+- New upstream version
+- Set a static uid and gid (#472073, #471918, #471919)
+- Add a conditional requirement on libselinux-ruby for Fedora >= 9
+- Add a dependency on ruby-augeas
+
 * Wed Oct 22 2008 Todd Zullinger <tmz@pobox.com> - 0.24.6-1
 - Update to 0.24.6
 - Require ruby-shadow on Fedora and RHEL >= 5

data/ext/dbfix.sql

@@ -0,0 +1,132 @@
+-- MySQL DB consistency check/fix
+-- 
+-- Usage:
+-- cat dbfix.sql | mysql -u user -p puppet
+--
+-- WARNING: perform a database backup before running this script
+
+-- Remove duplicate resources, and keep the latest one
+DELETE bad_rows.*
+FROM resources AS bad_rows
+  INNER JOIN (
+    SELECT title,restype,host_id, MAX(id) as max_id
+    FROM resources
+    GROUP BY title,restype,host_id
+    HAVING count(*) > 1
+  ) AS good_rows 
+  ON 
+    good_rows.title = bad_rows.title AND 
+    good_rows.restype = bad_rows.restype AND 
+    good_rows.host_id = bad_rows.host_id AND 
+    good_rows.max_id <> bad_rows.id;
+
+-- Remove duplicate param_values, and keep the latest one
+DELETE bad_rows.*
+FROM param_values AS bad_rows
+  INNER JOIN (
+    SELECT value,param_name_id,resource_id, MAX(id) as max_id
+    FROM param_values
+    GROUP BY value,param_name_id,resource_id
+    HAVING count(*) > 1
+  ) AS good_rows 
+  ON 
+    good_rows.value = bad_rows.value AND 
+    good_rows.param_name_id = bad_rows.param_name_id AND 
+    good_rows.resource_id = bad_rows.resource_id AND 
+    good_rows.max_id <> bad_rows.id;
+
+-- rewrite param_values that points to duplicated param_names
+-- to point to the highest param_name id.
+UPDATE 
+  param_values v 
+  INNER JOIN
+  param_names n
+  ON n.id = v.param_name_id
+  INNER JOIN
+  (
+    SELECT name, MAX(id) as max_id
+    FROM param_names
+    GROUP BY name
+    HAVING count(*) > 1
+  ) nmax ON n.name = nmax.name
+SET
+  v.param_name_id = nmax.max_id;
+
+-- Remove duplicate param_names, and keep the latest one
+DELETE bad_rows.*
+FROM param_names AS bad_rows
+  INNER JOIN (
+    SELECT name, MAX(id) as max_id
+    FROM param_names
+    GROUP BY name
+    HAVING count(*) > 1
+  ) AS good_rows 
+  ON 
+    good_rows.name = bad_rows.name AND
+    good_rows.max_id <> bad_rows.id;
+
+-- Remove duplicate resource_tags, and keep the highest one
+DELETE bad_rows.*
+FROM resource_tags AS bad_rows
+  INNER JOIN (
+    SELECT resource_id,puppet_tag_id, MAX(id) as max_id
+    FROM resource_tags
+    GROUP BY resource_id,puppet_tag_id
+    HAVING count(*) > 1
+  ) AS good_rows 
+  ON 
+    good_rows.resource_id = bad_rows.resource_id AND
+    good_rows.puppet_tag_id = bad_rows.puppet_tag_id AND
+    good_rows.max_id <> bad_rows.id;
+
+-- rewrite resource_tags that points to duplicated puppet_tags
+-- to point to the highest puppet_tags id.
+UPDATE 
+  resource_tags v 
+  INNER JOIN
+  puppet_tags n
+  ON n.id = v.puppet_tag_id
+  INNER JOIN
+  (
+    SELECT name, MAX(id) as max_id
+    FROM puppet_tags
+    GROUP BY name
+    HAVING count(*) > 1
+  ) nmax ON n.name = nmax.name
+SET
+  v.puppet_tag_id = nmax.max_id;
+
+-- Remove duplicate puppet_tags, and keep the highest one
+DELETE bad_rows.*
+FROM puppet_tags AS bad_rows
+  INNER JOIN (
+    SELECT name, MAX(id) as max_id
+    FROM puppet_tags
+    GROUP BY name
+    HAVING count(*) > 1
+  ) AS good_rows 
+  ON 
+    good_rows.name = bad_rows.name AND
+    good_rows.max_id <> bad_rows.id;
+
+-- Fix dangling resources
+-- note: we use a table to not exceed the number of InnoDB locks if there are two much
+-- rows to delete.
+-- this is an alternative to: DELETE resources FROM resources r LEFT JOIN hosts h ON h.id=r.host_id WHERE h.id IS NULL;
+--
+CREATE TABLE resources_c LIKE resources;
+INSERT INTO resources_c SELECT r.* FROM resources r INNER JOIN hosts h ON h.id=r.host_id;
+RENAME TABLE resources TO resources_old, resources_c TO resources;
+DROP TABLE resources_old;
+
+-- Fix dangling param_values
+CREATE TABLE param_values_c LIKE param_values;
+INSERT INTO param_values_c SELECT v.* FROM param_values v INNER JOIN resources r ON r.id=v.resource_id;
+RENAME TABLE param_values TO param_values_old, param_values_c TO param_values;
+DROP TABLE param_values_old;
+
+-- Fix dangling resource_tags
+CREATE TABLE resource_tags_c LIKE resource_tags;
+INSERT INTO resource_tags_c SELECT t.* FROM resource_tags t INNER JOIN resources r ON r.id=t.resource_id;
+RENAME TABLE resource_tags TO resource_tags_old, resource_tags_c TO resource_tags;
+DROP TABLE resource_tags_old;

data/ext/logcheck/puppet

@@ -1,5 +1,6 @@
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: (Handled resources in|Resource comparison took|Searched for (host|resources|resource params and tags) in) [0-9.]+ seconds
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Starting Puppet server version [.0-9]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Compiled configuration for [._[:alnum:]-]+ in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Compiled catalog for [._[:alnum:]-]+ in [.0-9]+ seconds$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Caught TERM; shutting down$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Shutting down$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Starting Puppet client version [.0-9]+$

data/ext/vim/syntax/puppet.vim

@@ -16,7 +16,7 @@ elseif exists("b:current_syntax")
   finish
 endif
 
-syn region  puppetDefine        start="^\s*\(class\|define\|site\|node\)" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments
+syn region  puppetDefine        start="^\s*\(class\|define\|node\)" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments
 syn keyword puppetDefType       class define site node inherits contained
 syn keyword puppetInherits      inherits contained
 syn region  puppetDefArguments  start="(" end=")" contains=puppetArgument
@@ -49,6 +49,7 @@ syn keyword puppetControl    case default
 
 " comments last overriding everything else
 syn match   puppetComment            "\s*#.*$" contains=puppetTodo
+syn region  puppetComment            start="/\*" end="\*/" contains=puppetTodo extend
 syn keyword puppetTodo               TODO NOTE FIXME XXX contained
 
 " Define the default highlighting.

data/install.rb

@@ -94,7 +94,7 @@ def do_libs(libs, strip = 'lib/')
     op = File.dirname(olf)
     File.makedirs(op, true)
     File.chmod(0755, op)
-    File.install(lf, olf, 0755, true)
+    File.install(lf, olf, 0644, true)
   end
 end
 
@@ -170,7 +170,7 @@ def prepare_installation
     opts.on('--[no-]ri', 'Prevents the creation of RI output.', 'Default off on mswin32.') do |onri|
       InstallOptions.ri = onri
     end
-    opts.on('--[no-]man', 'Presents the creation of man pages.', 'Default on.') do |onman|
+    opts.on('--[no-]man', 'Prevents the creation of man pages.', 'Default on.') do |onman|
     InstallOptions.man = onman
     end
     opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|

data/lib/puppet.rb

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

data/lib/puppet/defaults.rb

@@ -95,8 +95,17 @@ module Puppet
         :path => {:default => "none",
             :desc => "The shell search path.  Defaults to whatever is inherited
                 from the parent process.",
+            :call_on_define => true, # Call our hook with the default value, so we always get the libdir set.
             :hook => proc do |value|
                 ENV["PATH"] = value unless value == "none"
+
+                paths = ENV["PATH"].split(File::PATH_SEPARATOR)
+                %w{/usr/sbin /sbin}.each do |path|
+                    unless paths.include?(path)
+                        ENV["PATH"] += File::PATH_SEPARATOR + path
+                    end
+                end
+                value
             end
         },
         :libdir => {:default => "$vardir/lib",