puppet 0.24.1 → 0.24.2

data/CHANGELOG

@@ -1,3 +1,97 @@
+0.24.2
+    Fixing #1062 by moving the yamldir setting to its own yaml
+    section.  This should keep the yamldir from being created
+    on clients.
+
+    Fixed #1047 -- Puppet's parser no longer changes the order
+    in which statements are evaluated, which means that case
+    statements can now set variables that are used by other
+    variables.
+
+    Fixed #1063 -- the master correctly logs syntax errors when
+    reparsing during a single run.
+
+    Removed the loglevels from the valid values for `logoutput`
+    in the Exec resource type -- the log levels are specified
+    using the `loglevel` parameter, not `logoutput`.  This never
+    worked, or at least hasn`t for ages, and now the docs are
+    just correct.
+
+    Somewhat refactored fileserving so that it no longer caches
+    any objects, nor does it use Puppet's RAL resources.  In the
+    process, I fixed #894 (you can now copy links) and refactored
+    other classes as necessary.  Mostly it was fixing tests.
+
+    Hopefully partially fixed #1010 -- clients should now fail
+    to install files whose checksums do not match the checksum
+    from the server.
+
+    Fixed #1018 -- resources now have their namevars added as
+    aliases in the resource catalog, just like they were added
+    in the resource classes.
+
+    Fixed #1037 -- remote unreadable files no longer have the
+    permission denied exceptions caught, thus forbidding them
+    from being replaced with 'nil'.
+
+    Fixed #1043 -- autoloading now searches the plugins directory
+    in each module, in addition to the lib directory.  The 'lib'
+    directory is also deprecated, but supported for now to give
+    people a chance to convert.
+
+    Fixed #1003 -- Applying DavidS's patch to fix searching for
+    tags in sql.
+
+    Fixed #992 -- Puppet is now compatible with gems 1.0.1.
+
+    Fixed #968 again, this time with tests -- parseonly works,
+    including not compiling the configurations, and also storeconfigs
+    is no longer required during parse-testing.
+
+    Fixed #1021 -- the problem was that my method of determining
+    the in-degree sometimes resulted in a lower number than the
+    number of in-edges.
+
+    Fixed #997 -- virtual defined types are no longer evaluated.
+    NOTE: This introduces a behaviour change, in that you previously
+    could realize a resource within a virtual defined resource, and now
+    you must realize the entire defined resource, rather than just
+    the contained resource.
+
+    Fixed #1030 - class and definition evaluation has been significantly
+    refactored, fixing this problem and making the whole interplay
+    between the classes, definitions, and nodes, and the Compile class much
+    cleaner.
+
+    Exec resources must now have unique names, although the commands can still
+    be duplicated.  This is easily accomplished by just specifying a unique
+    name with whatever (unique or otherwise) command you need.
+
+    Fixed #989 -- missing CRL files are correctly ignored, and the
+    value should be set to 'false' to explicitly not look for these
+    files.
+
+    Fixed #1017 -- environment-specific modulepath is no longer ignored.
+
+    Fixing #794 -- consolidating the gentoo configuration files.
+
+    Fixing #976 -- both the full name of qualified classes and
+    the class parts are now added as tags.  I've also
+    created a Tagging module that we should push throughout
+    the rest of the system that uses tags.
+
+    Fixing #995 -- puppetd no longer dies at startup if the server
+    is not running.
+
+    Fixing #977 -- the rundir is again set to 1777.
+
+    Fixed #971 -- classes can once again be included multiple
+    times.
+
+    Added builtin support for Nagios types using
+    Naginator to parse and generate the files.
+
+0.24.1
     Updated vim filetype detection. (#900 and #963)
 
     Default resources like schedules no longer conflict with

data/Rakefile

@@ -83,10 +83,6 @@ rule(/_is_runnable$/) do |t|
     end
 end
 
-file "debian" => :bzr_is_runnable do
-    system("bzr get http://www.hezmatt.org/~mpalmer/bzr/puppet.debian.svn debian") || exit(1)
-end
-
 task :check_build_deps => 'dpkg-checkbuilddeps_is_runnable' do
     system("dpkg-checkbuilddeps") || exit(1)
 end

data/bin/puppet

@@ -136,6 +136,14 @@ end
 
 Puppet.parse_config
 
+# Now parse the config
+if Puppet[:config] and File.exists? Puppet[:config]
+    Puppet.settings.parse(Puppet[:config])
+end
+
+Puppet.genconfig
+Puppet.genmanifest
+
 # If noop is set, then also enable diffs
 if Puppet[:noop]
     Puppet[:show_diff] = true
@@ -156,14 +164,6 @@ elsif options[:verbose]
     Puppet::Util::Log.level = :info
 end
 
-# Now parse the config
-if Puppet[:config] and File.exists? Puppet[:config]
-    Puppet.settings.parse(Puppet[:config])
-end
-
-Puppet.genconfig
-Puppet.genmanifest
-
 # Set our code or file to use.
 if options[:code] or ARGV.length == 0
     Puppet[:code] = options[:code] || STDIN.read
@@ -171,6 +171,16 @@ else
     Puppet[:manifest] = ARGV.shift
 end
 
+if Puppet[:parseonly]
+    begin
+        Puppet::Parser::Interpreter.new.parser(Puppet[:environment])
+    rescue => detail
+        Puppet.err detail
+        exit 1
+    end
+    exit 0
+end
+
 # Collect our facts.
 facts = Puppet::Node::Facts.find("me")
 facts.name = facts.values["hostname"]
@@ -198,8 +208,6 @@ begin
     # Compile our catalog
     catalog = Puppet::Node::Catalog.find(node)
 
-    exit(0) if Puppet[:parseonly]
-
     # Translate it to a RAL catalog
     catalog = catalog.to_ral
 

data/bin/puppetd

@@ -374,7 +374,7 @@ if Puppet[:listen] and ! options[:onetime]
     # to clients. In the meantime, we just disable CRL checking if
     # the CRL file doesn't exist
     unless File::exist?(Puppet[:cacrl])
-        Puppet[:cacrl] = 'none'
+        Puppet[:cacrl] = 'false' 
     end
 
     handlers = nil

data/bin/puppetdoc

@@ -128,11 +128,19 @@ else
     else
         with_contents = true
     end
+    exit_code = 0
     options[:references].sort { |a,b| a.to_s <=> b.to_s }.each do |name|
-        section = Puppet::Util::Reference.reference(name)
-
-        # Add the per-section text, but with no ToC
-        text += section.send(options[:format], with_contents)
+        raise "Could not find reference %s" % name unless section = Puppet::Util::Reference.reference(name)
+
+        begin
+            # Add the per-section text, but with no ToC
+            text += section.send(options[:format], with_contents)
+        rescue => detail
+            puts detail.backtrace
+            $stderr.puts "Could not generate reference %s: %s" % [name, detail]
+            exit_code = 1
+            next
+        end
     end
 
     unless with_contents # We've only got one reference
@@ -147,6 +155,8 @@ else
     else
         puts text
     end
+
+    exit exit_code
 end
 
 

data/bin/puppetmasterd

@@ -81,13 +81,13 @@ end
 
 require 'getoptlong'
 require 'puppet'
+require 'puppet/network/handler'
 require 'puppet/sslcertificates'
 
 options = [
 	[ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
 	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
 	[ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
-	[ "--noca",         			GetoptLong::NO_ARGUMENT ],
 	[ "--nobucket",        			GetoptLong::NO_ARGUMENT ],
 	[ "--noreports",       			GetoptLong::NO_ARGUMENT ],
 	[ "--nonodes",         			GetoptLong::NO_ARGUMENT ],

data/bin/puppetrun

@@ -40,7 +40,7 @@
 # you want any Puppet daemon to allow -- it is currently global to all Puppet
 # daemons.
 #
-# An example file looks like this:
+# An example file looks like this::
 #
 #     [fileserver]
 #         allow *.madstop.com
@@ -274,14 +274,9 @@ else
 end
 
 # Now parse the config
-config = File.join(Puppet[:confdir], "puppetmasterd.conf")
-Puppet.parse_config(config)
+Puppet.parse_config
 
-if File.exists? config
-    Puppet.settings.parse(config)
-end
-
-if Puppet[:ldapnodes]
+if Puppet[:node_terminus] = "ldap"
     if options[:all]
         hosts = ldapnodes(:all, options[:fqdn])
         puts "all: %s" % hosts.join(", ")

data/bin/ralsh

@@ -63,17 +63,18 @@
 #
 # = Example
 #
-#   $ ralsh user luke
-#   user { 'luke':
-#       home => '/home/luke',
-#       uid => '100',
-#       ensure => 'present',
-#       comment => 'Luke Kanies,,,',
-#       gid => '1000',
-#       shell => '/bin/bash',
-#       groups => ['sysadmin','audio','video','puppet']
-#   }
-#   $
+# This example uses ``ralsh`` to return Puppet configuration for the user ``luke``::
+#   
+# $ ralsh user luke
+#    user { 'luke':
+#      home => '/home/luke',
+#      uid => '100',
+#      ensure => 'present',
+#      comment => 'Luke Kanies,,,',
+#      gid => '1000',
+#      shell => '/bin/bash',
+#      groups => ['sysadmin','audio','video','puppet']
+#    }
 #
 # = Author
 #

data/conf/freebsd/puppetd

@@ -18,7 +18,7 @@ pidfile="/var/run/$name.pid"
 # read configuration and set defaults
 load_rc_config "$name"
 : ${puppetd_enable="NO"}
-: ${puppetd_config="/usr/local/etc/puppetd.conf"}
+: ${puppetd_config="/usr/local/etc/puppet.conf"}
 : ${puppetd_flags=""}
 
 command_args="--config $puppetd_config $puppetd_flags"

data/conf/freebsd/puppetmasterd

@@ -18,7 +18,7 @@ pidfile="/var/run/$name.pid"
 # read configuration and set defaults
 load_rc_config "$name"
 : ${puppetmasterd_enable="NO"}
-: ${puppetmasterd_config="/usr/local/etc/puppetmasterd.conf"}
+: ${puppetmasterd_config="/usr/local/etc/puppet.conf"}
 : ${puppetmasterd_flags=""}
 
 command_args="--config $puppetmasterd_config $puppetmasterd_flags"

data/conf/gentoo/puppet/puppet.conf

@@ -0,0 +1,29 @@
+[main] 
+    # Where Puppet stores dynamic and growing data. 
+    # The default value is '/var/puppet'. 
+    vardir = /var/lib/puppet 
+ 
+    # The Puppet log directory. 
+    # The default value is '$vardir/log'. 
+    logdir = /var/log/puppet 
+ 
+    # Where Puppet PID files are kept. 
+    # The default value is '$vardir/run'. 
+    rundir = /var/run/puppet 
+ 
+    # Where SSL certificates are kept. 
+    # The default value is '$confdir/ssl'. 
+    ssldir = $vardir/ssl 
+ 
+[puppetd] 
+    # The file in which puppetd stores a list of the classes 
+    # associated with the retrieved configuratiion.  Can be loaded in 
+    # the separate ``puppet`` executable using the ``--loadclasses`` 
+    # option. 
+    # The default value is '$confdir/classes.txt'. 
+    classfile = $vardir/classes.txt 
+ 
+    # Where puppetd caches the local configuration.  An 
+    # extension indicating the cache format is added automatically. 
+    # The default value is '$confdir/localconfig'. 
+    localconfig = $vardir/localconfig 

data/conf/namespaceauth.conf

@@ -0,0 +1,20 @@
+# This is an example namespaceauth.conf file,
+# which you'll need if you want to start a client
+# in --listen mode.
+[fileserver]
+    allow *.domain.com
+
+[puppetmaster]
+    allow *.domain.com
+
+[puppetrunner]
+    allow culain.domain.com
+
+[puppetbucket]
+    allow *.domain.com
+
+[puppetreports]
+    allow *.domain.com
+
+[resource]
+    allow server.domain.com

data/conf/redhat/puppet.spec

@@ -7,7 +7,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.24.1
+Version: 0.24.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -157,6 +157,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Sat Dec 22 2007 David Lutterkort <dlutter@redhat.com> - 0.24.1-1
+- New version
+
 * Mon Dec 17 2007 David Lutterkort <dlutter@redhat.com> - 0.24.0-2
 - Use updated upstream tarball that contains yumhelper.py
 

data/conf/solaris/smf/puppetd.xml

@@ -18,7 +18,7 @@
                     grouping='require_all'
                     restart_on='none'
                     type='path'>
-                <service_fmri value='file:///etc/puppet/puppetd.conf'/>
+                <service_fmri value='file:///etc/puppet/puppet.conf'/>
         </dependency>
         
 	<dependency name='loopback'

data/conf/solaris/smf/puppetmasterd.xml

@@ -18,7 +18,7 @@
                     grouping='require_all'
                     restart_on='none'
                     type='path'>
-                <service_fmri value='file:///etc/puppet/puppetmasterd.conf'/>
+                <service_fmri value='file:///etc/puppet/puppet.conf'/>
         </dependency>
         
 	<dependency name='loopback'

data/conf/suse/puppet.spec

@@ -5,7 +5,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.18.4
+Version: 0.24.1
 Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -15,11 +15,11 @@ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
 Patch0: puppet.suse.patch
 Patch1: puppet.service.patch
 
-Requires: ruby >= 1.8.1
-Requires: facter >= 1.1.4
+Requires: ruby >= 1.8.6
+Requires: facter >= 1.3.7
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
-BuildRequires: ruby >= 1.8.1
+BuildRequires: ruby >= 1.8.6
 
 %description
 Puppet lets you centrally manage every important aspect of your system using a 
@@ -67,9 +67,7 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
 %{__install} -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
 %{__install} -Dp -m0755 %{suseconfdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
 %{__install} -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
-%{__install} -Dp -m0644 %{confdir}/puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
-%{__ln_s} puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
-%{__ln_s} puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf
+%{__install} -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
 %{__install} -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
 
 %files
@@ -79,7 +77,7 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
-%config(noreplace) %{_sysconfdir}/puppet/puppetd.conf
+%config(noreplace) %{_sysconfdir}/puppet/puppet.conf
 %doc CHANGELOG COPYING LICENSE README TODO examples
 %exclude %{_sbindir}/puppetdoc
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
@@ -131,6 +129,10 @@ fi
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Sat Feb 16 2008 James Turnbull <james@lovedthanlost.net> - 0.24.1-1
+- Fixed puppet configuation file references to match single puppet.conf file
+- Update versions for 0.24.1 release
+ 
 * Tue Aug  3 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-3
 - Replaced puppet-bin.patch with %build section from David's spec
 

data/examples/root/etc/puppet/{puppetmasterd.conf → puppet.conf}

@@ -1,7 +1,10 @@
+[puppetd]
+report = true
+factsync = true
+pluginsync = true
+
 [puppetmasterd]
 reports = store,rrdgraph,tagmail,log
-
-[ldap]
-ldapnodes = true
+node_terminus = ldap
 ldapserver = culain.madstop.com
 ldapbase = dc=madstop,dc=com